Skip to content

Commit 2b8590e

Browse files
committedJan 12, 2023
Auto merge of rust-lang#106757 - matthiaskrgr:rollup-9j8830g, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#106167 (Fix invalid syntax and incomplete suggestion in impl Trait parameter type suggestions for E0311) - rust-lang#106309 (Prefer non-`[type error]` candidates during selection) - rust-lang#106532 (Allow codegen to unsize `dyn*` to `dyn`) - rust-lang#106596 (Hide more of long types in E0271) - rust-lang#106638 (std tests: use __OsLocalKeyInner from realstd) - rust-lang#106676 (Test that we cannot use trait impl methods arguments as defining uses) - rust-lang#106702 (Conserve cause of `ImplDerivedObligation` in E0599) - rust-lang#106732 (rustc_llvm: replace llvm::makeArrayRef with ArrayRef constructors.) - rust-lang#106733 (Revert "warn newer available version of the x tool") - rust-lang#106748 (Clean up `OnUnimplementedFormatString::verify`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4887cb1 + e8ef83e commit 2b8590e

File tree

62 files changed

+860
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+860
-337
lines changed
 

‎Cargo.lock

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5034,18 +5034,18 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
50345034

50355035
[[package]]
50365036
name = "semver"
5037-
version = "1.0.14"
5037+
version = "1.0.12"
50385038
source = "registry+https://github.com/rust-lang/crates.io-index"
5039-
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
5039+
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
50405040
dependencies = [
50415041
"serde",
50425042
]
50435043

50445044
[[package]]
50455045
name = "serde"
5046-
version = "1.0.152"
5046+
version = "1.0.147"
50475047
source = "registry+https://github.com/rust-lang/crates.io-index"
5048-
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
5048+
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
50495049
dependencies = [
50505050
"serde_derive",
50515051
]
@@ -5062,9 +5062,9 @@ dependencies = [
50625062

50635063
[[package]]
50645064
name = "serde_derive"
5065-
version = "1.0.152"
5065+
version = "1.0.147"
50665066
source = "registry+https://github.com/rust-lang/crates.io-index"
5067-
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
5067+
checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
50685068
dependencies = [
50695069
"proc-macro2",
50705070
"quote",
@@ -5082,9 +5082,9 @@ dependencies = [
50825082

50835083
[[package]]
50845084
name = "serde_json"
5085-
version = "1.0.91"
5085+
version = "1.0.85"
50865086
source = "registry+https://github.com/rust-lang/crates.io-index"
5087-
checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
5087+
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
50885088
dependencies = [
50895089
"indexmap",
50905090
"itoa",
@@ -5400,9 +5400,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
54005400

54015401
[[package]]
54025402
name = "syn"
5403-
version = "1.0.107"
5403+
version = "1.0.102"
54045404
source = "registry+https://github.com/rust-lang/crates.io-index"
5405-
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
5405+
checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
54065406
dependencies = [
54075407
"proc-macro2",
54085408
"quote",
@@ -5576,7 +5576,6 @@ dependencies = [
55765576
"lazy_static",
55775577
"miropt-test-tools",
55785578
"regex",
5579-
"semver",
55805579
"termcolor",
55815580
"walkdir",
55825581
]

‎compiler/rustc_codegen_ssa/src/base.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ pub fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
153153
(
154154
&ty::Dynamic(ref data_a, _, src_dyn_kind),
155155
&ty::Dynamic(ref data_b, _, target_dyn_kind),
156-
) => {
157-
assert_eq!(src_dyn_kind, target_dyn_kind);
158-
156+
) if src_dyn_kind == target_dyn_kind => {
159157
let old_info =
160158
old_info.expect("unsized_info: missing old info for trait upcasting coercion");
161159
if data_a.principal_def_id() == data_b.principal_def_id() {

0 commit comments

Comments
 (0)
Please sign in to comment.