Skip to content

Commit 5a93c74

Browse files
authored
Rollup merge of rust-lang#128727 - RalfJung:conflicting-repr-future-incompat, r=lcnr
bump conflicting_repr_hints lint to be shown in dependencies This has been a future compatibility lint for years, let's bump it up to be shown in dependencies (so that hopefully we can then make it a hard error fairly soon). Cc rust-lang#68585
2 parents 6b678c5 + ac23a2e commit 5a93c74

File tree

4 files changed

+62
-1
lines changed

4 files changed

+62
-1
lines changed

compiler/rustc_lint_defs/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ declare_lint! {
251251
Deny,
252252
"conflicts between `#[repr(..)]` hints that were previously accepted and used in practice",
253253
@future_incompatible = FutureIncompatibleInfo {
254-
reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,
254+
reason: FutureIncompatibilityReason::FutureReleaseErrorReportInDeps,
255255
reference: "issue #68585 <https://github.com/rust-lang/rust/issues/68585>",
256256
};
257257
}

tests/ui/feature-gates/feature-gate-repr-simd.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,17 @@ error: aborting due to 3 previous errors
3535

3636
Some errors have detailed explanations: E0566, E0658.
3737
For more information about an error, try `rustc --explain E0566`.
38+
Future incompatibility report: Future breakage diagnostic:
39+
error[E0566]: conflicting representation hints
40+
--> $DIR/feature-gate-repr-simd.rs:4:8
41+
|
42+
LL | #[repr(C)]
43+
| ^
44+
LL |
45+
LL | #[repr(simd)]
46+
| ^^^^
47+
|
48+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
49+
= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
50+
= note: `#[deny(conflicting_repr_hints)]` on by default
51+

tests/ui/issues/issue-47094.stderr

+25
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,28 @@ LL | #[repr(u8)]
2323
error: aborting due to 2 previous errors
2424

2525
For more information about this error, try `rustc --explain E0566`.
26+
Future incompatibility report: Future breakage diagnostic:
27+
error[E0566]: conflicting representation hints
28+
--> $DIR/issue-47094.rs:1:8
29+
|
30+
LL | #[repr(C, u8)]
31+
| ^ ^^
32+
|
33+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
34+
= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
35+
= note: `#[deny(conflicting_repr_hints)]` on by default
36+
37+
Future breakage diagnostic:
38+
error[E0566]: conflicting representation hints
39+
--> $DIR/issue-47094.rs:8:8
40+
|
41+
LL | #[repr(C)]
42+
| ^
43+
LL |
44+
LL | #[repr(u8)]
45+
| ^^
46+
|
47+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
48+
= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
49+
= note: `#[deny(conflicting_repr_hints)]` on by default
50+

tests/ui/repr/conflicting-repr-hints.stderr

+22
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,25 @@ error: aborting due to 12 previous errors
8181

8282
Some errors have detailed explanations: E0566, E0587, E0634.
8383
For more information about an error, try `rustc --explain E0566`.
84+
Future incompatibility report: Future breakage diagnostic:
85+
error[E0566]: conflicting representation hints
86+
--> $DIR/conflicting-repr-hints.rs:13:8
87+
|
88+
LL | #[repr(C, u64)]
89+
| ^ ^^^
90+
|
91+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
92+
= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
93+
= note: `#[deny(conflicting_repr_hints)]` on by default
94+
95+
Future breakage diagnostic:
96+
error[E0566]: conflicting representation hints
97+
--> $DIR/conflicting-repr-hints.rs:19:8
98+
|
99+
LL | #[repr(u32, u64)]
100+
| ^^^ ^^^
101+
|
102+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
103+
= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
104+
= note: `#[deny(conflicting_repr_hints)]` on by default
105+

0 commit comments

Comments
 (0)