Skip to content

Commit 1d667a0

Browse files
xFrednetxFrednet
committed
Prevent ICE from expected future breakage
1 parent b124b36 commit 1d667a0

File tree

3 files changed

+69
-20
lines changed

3 files changed

+69
-20
lines changed

‎compiler/rustc_errors/src/json.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,12 @@ impl Emitter for JsonEmitter {
135135
let data: Vec<FutureBreakageItem<'_>> = diags
136136
.into_iter()
137137
.map(|mut diag| {
138-
if diag.level == crate::Level::Allow {
138+
// The `FutureBreakageItem` is collected and serialized.
139+
// However, the `allow` and `expect` lint levels can't usually
140+
// be serialized. The lint level is overwritten to allow the
141+
// serialization again and force a lint emission.
142+
// (This is an educated guess. I didn't originally add this)
143+
if matches!(diag.level, crate::Level::Allow | crate::Level::Expect(..)) {
139144
diag.level = crate::Level::Warning;
140145
}
141146
FutureBreakageItem {

‎tests/ui/lint/expect-future_breakage-crash-issue-126521.rs

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ check-pass
2+
13
// This test covers similar crashes from both #126521 and #126751.
24

35
macro_rules! foo {
@@ -12,12 +14,25 @@ macro_rules! bar {
1214
};
1315
}
1416

15-
fn main() {
17+
fn allow() {
18+
#[allow(semicolon_in_expressions_from_macros)]
19+
let _ = foo!(x);
20+
21+
#[allow(semicolon_in_expressions_from_macros)]
22+
let _ = bar!(x);
23+
}
24+
25+
// The `semicolon_in_expressions_from_macros` lint seems to be emitted even if the
26+
// lint level is `allow` as shown in the function above. The behavior of `expect`
27+
// should mirror this behavior. However, no `unfulfilled_lint_expectation` lint
28+
// is emitted, since the expectation is theoretically fulfilled.
29+
fn expect() {
1630
#[expect(semicolon_in_expressions_from_macros)]
17-
//~^ ERROR the `#[expect]` attribute is an experimental feature
1831
let _ = foo!(x);
1932

2033
#[expect(semicolon_in_expressions_from_macros)]
21-
//~^ ERROR the `#[expect]` attribute is an experimental feature
2234
let _ = bar!(x);
2335
}
36+
37+
fn main() {
38+
}

‎tests/ui/lint/expect-future_breakage-crash-issue-126521.stderr

+45-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,52 @@
1-
error[E0658]: the `#[expect]` attribute is an experimental feature
2-
--> $DIR/expect-future_breakage-crash-issue-126521.rs:16:5
1+
Future incompatibility report: Future breakage diagnostic:
2+
warning: trailing semicolon in macro used in expression position
3+
--> $DIR/expect-future_breakage-crash-issue-126521.rs:7:13
34
|
4-
LL | #[expect(semicolon_in_expressions_from_macros)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
LL | true;
6+
| ^
7+
...
8+
LL | let _ = foo!(x);
9+
| ------- in this macro invocation
610
|
7-
= note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
8-
= help: add `#![feature(lint_reasons)]` to the crate attributes to enable
9-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
11+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
12+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
13+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
1014

11-
error[E0658]: the `#[expect]` attribute is an experimental feature
12-
--> $DIR/expect-future_breakage-crash-issue-126521.rs:20:5
15+
Future breakage diagnostic:
16+
warning: trailing semicolon in macro used in expression position
17+
--> $DIR/expect-future_breakage-crash-issue-126521.rs:13:35
1318
|
14-
LL | #[expect(semicolon_in_expressions_from_macros)]
15-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19+
LL | (5_i32.overflowing_sub(3));
20+
| ^
21+
...
22+
LL | let _ = bar!(x);
23+
| ------- in this macro invocation
1624
|
17-
= note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
18-
= help: add `#![feature(lint_reasons)]` to the crate attributes to enable
19-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
25+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
26+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
27+
= note: this warning originates in the macro `bar` (in Nightly builds, run with -Z macro-backtrace for more info)
2028

21-
error: aborting due to 2 previous errors
29+
Future breakage diagnostic:
30+
warning: trailing semicolon in macro used in expression position
31+
--> $DIR/expect-future_breakage-crash-issue-126521.rs:7:13
32+
|
33+
LL | true;
34+
| ^
35+
...
36+
LL | let _ = foo!(x);
37+
| ------- in this macro invocation
38+
|
39+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
40+
41+
Future breakage diagnostic:
42+
warning: trailing semicolon in macro used in expression position
43+
--> $DIR/expect-future_breakage-crash-issue-126521.rs:13:35
44+
|
45+
LL | (5_i32.overflowing_sub(3));
46+
| ^
47+
...
48+
LL | let _ = bar!(x);
49+
| ------- in this macro invocation
50+
|
51+
= note: this warning originates in the macro `bar` (in Nightly builds, run with -Z macro-backtrace for more info)
2252

23-
For more information about this error, try `rustc --explain E0658`.

0 commit comments

Comments
 (0)