Skip to content

Commit e1a522b

Browse files
notriddlenotriddle
authored
Rollup merge of rust-lang#102635 - lcnr:incoherent_auto_trait_objects, r=jackh726
make `order_dependent_trait_objects` show up in future-breakage reports tried to change it to a hard error in rust-lang#102474 but breaking the more than 1000 dependents of `traitobject` doesn't feel great 😅 This lint has existed since more than 3 years now and the way this is currently implemented is buggy and will break with rust-lang#102472. imo we should upgrade it to also report for dependencies and maybe also backport this to beta. Then after maybe 2-3 stable versions I would like to finally convert this lint to a hard error.
2 parents b22480f + a5e116e commit e1a522b

File tree

4 files changed

+113
-0
lines changed

4 files changed

+113
-0
lines changed

‎compiler/rustc_lint_defs/src/builtin.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,6 +1427,7 @@ declare_lint! {
14271427
"trait-object types were treated as different depending on marker-trait order",
14281428
@future_incompatible = FutureIncompatibleInfo {
14291429
reference: "issue #56484 <https://github.com/rust-lang/rust/issues/56484>",
1430+
reason: FutureIncompatibilityReason::FutureReleaseErrorReportNow,
14301431
};
14311432
}
14321433

‎src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,45 @@ LL | impl Foo for dyn Send + Sync + Send {}
3737

3838
error: aborting due to 3 previous errors
3939

40+
Future incompatibility report: Future breakage diagnostic:
41+
error: conflicting implementations of trait `Foo` for type `(dyn std::marker::Send + 'static)`: (E0119)
42+
--> $DIR/lint-incoherent-auto-trait-objects.rs:5:1
43+
|
44+
LL | impl Foo for dyn Send {}
45+
| --------------------- first implementation here
46+
LL |
47+
LL | impl Foo for dyn Send + Send {}
48+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + 'static)`
49+
|
50+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
51+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
52+
= note: `#[deny(order_dependent_trait_objects)]` on by default
53+
54+
Future breakage diagnostic:
55+
error: conflicting implementations of trait `Foo` for type `(dyn std::marker::Send + std::marker::Sync + 'static)`: (E0119)
56+
--> $DIR/lint-incoherent-auto-trait-objects.rs:11:1
57+
|
58+
LL | impl Foo for dyn Send + Sync {}
59+
| ---------------------------- first implementation here
60+
LL |
61+
LL | impl Foo for dyn Sync + Send {}
62+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
63+
|
64+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
65+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
66+
= note: `#[deny(order_dependent_trait_objects)]` on by default
67+
68+
Future breakage diagnostic:
69+
error: conflicting implementations of trait `Foo` for type `(dyn std::marker::Send + std::marker::Sync + 'static)`: (E0119)
70+
--> $DIR/lint-incoherent-auto-trait-objects.rs:15:1
71+
|
72+
LL | impl Foo for dyn Sync + Send {}
73+
| ---------------------------- first implementation here
74+
...
75+
LL | impl Foo for dyn Send + Sync + Send {}
76+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
77+
|
78+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
79+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
80+
= note: `#[deny(order_dependent_trait_objects)]` on by default
81+

‎src/test/ui/traits/issue-33140-hack-boundaries.stderr‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,20 @@ error: aborting due to 8 previous errors
6666

6767
Some errors have detailed explanations: E0119, E0751.
6868
For more information about an error, try `rustc --explain E0119`.
69+
Future incompatibility report: Future breakage diagnostic:
70+
warning: conflicting implementations of trait `Trait0` for type `(dyn std::marker::Send + 'static)`: (E0119)
71+
--> $DIR/issue-33140-hack-boundaries.rs:10:1
72+
|
73+
LL | impl Trait0 for dyn Send {}
74+
| ------------------------ first implementation here
75+
LL | impl Trait0 for dyn Send {}
76+
| ^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + 'static)`
77+
|
78+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
79+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
80+
note: the lint level is defined here
81+
--> $DIR/issue-33140-hack-boundaries.rs:2:10
82+
|
83+
LL | #![allow(order_dependent_trait_objects)]
84+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
85+

‎src/test/ui/traits/object/issue-33140-traitobject-crate.stderr‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,56 @@ LL | unsafe impl Trait for dyn (::std::marker::Sync) + Send + Sync { }
4040

4141
warning: 3 warnings emitted
4242

43+
Future incompatibility report: Future breakage diagnostic:
44+
warning: conflicting implementations of trait `Trait` for type `(dyn std::marker::Send + std::marker::Sync + 'static)`: (E0119)
45+
--> $DIR/issue-33140-traitobject-crate.rs:86:1
46+
|
47+
LL | unsafe impl Trait for dyn (::std::marker::Send) + Sync { }
48+
| ------------------------------------------------------ first implementation here
49+
LL | unsafe impl Trait for dyn (::std::marker::Send) + Send + Sync { }
50+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
51+
|
52+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
53+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
54+
note: the lint level is defined here
55+
--> $DIR/issue-33140-traitobject-crate.rs:3:9
56+
|
57+
LL | #![warn(order_dependent_trait_objects)]
58+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
59+
60+
Future breakage diagnostic:
61+
warning: conflicting implementations of trait `Trait` for type `(dyn std::marker::Send + std::marker::Sync + 'static)`: (E0119)
62+
--> $DIR/issue-33140-traitobject-crate.rs:89:1
63+
|
64+
LL | unsafe impl Trait for dyn (::std::marker::Send) + Send + Sync { }
65+
| ------------------------------------------------------------- first implementation here
66+
...
67+
LL | unsafe impl Trait for dyn (::std::marker::Sync) + Send { }
68+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
69+
|
70+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
71+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
72+
note: the lint level is defined here
73+
--> $DIR/issue-33140-traitobject-crate.rs:3:9
74+
|
75+
LL | #![warn(order_dependent_trait_objects)]
76+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
77+
78+
Future breakage diagnostic:
79+
warning: conflicting implementations of trait `Trait` for type `(dyn std::marker::Send + std::marker::Sync + 'static)`: (E0119)
80+
--> $DIR/issue-33140-traitobject-crate.rs:93:1
81+
|
82+
LL | unsafe impl Trait for dyn (::std::marker::Sync) + Send { }
83+
| ------------------------------------------------------ first implementation here
84+
...
85+
LL | unsafe impl Trait for dyn (::std::marker::Sync) + Send + Sync { }
86+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
87+
|
88+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
89+
= note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
90+
note: the lint level is defined here
91+
--> $DIR/issue-33140-traitobject-crate.rs:3:9
92+
|
93+
LL | #![warn(order_dependent_trait_objects)]
94+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
95+

0 commit comments

Comments
 (0)