bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix another assertion failure for some Expect diagnostics.

Browse source 
Very similar to #126719. So much so that I added a new case to the test
from that PR rather than creating a new one.
This commit is contained in:
Nicholas Nethercote 2024-06-21 13:58:06 +10:00
parent a9c8887c7d
commit d6efcbb760
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_errors/src/lib.rs
View file

@ -1456,10 +1456,10 @@ impl DiagCtxtInner {
} }
if diagnostic.has_future_breakage() { if diagnostic.has_future_breakage() {
// Future breakages aren't emitted if they're `Level::Allow`, // Future breakages aren't emitted if they're `Level::Allow` or
// but they still need to be constructed and stashed below, // `Level::Expect`, but they still need to be constructed and
// so they'll trigger the must_produce_diag check. // stashed below, so they'll trigger the must_produce_diag check.
assert!(matches!(diagnostic.level, Error | Warning | Allow)); assert!(matches!(diagnostic.level, Error | Warning | Allow | Expect(_)));
self.future_breakage_diagnostics.push(diagnostic.clone()); self.future_breakage_diagnostics.push(diagnostic.clone());
} }

12
tests/ui/lint/expect-future_breakage-crash-issue-126521.rs
View file

@ -1,11 +1,23 @@
// This test covers similar crashes from both #126521 and #126751.
macro_rules! foo { macro_rules! foo {
($val:ident) => { ($val:ident) => {
true; true;
}; };
} }
macro_rules! bar {
($val:ident) => {
(5_i32.overflowing_sub(3));
};
}
fn main() { fn main() {
#[expect(semicolon_in_expressions_from_macros)] #[expect(semicolon_in_expressions_from_macros)]
//~^ ERROR the `#[expect]` attribute is an experimental feature //~^ ERROR the `#[expect]` attribute is an experimental feature
let _ = foo!(x); let _ = foo!(x);
#[expect(semicolon_in_expressions_from_macros)]
//~^ ERROR the `#[expect]` attribute is an experimental feature
let _ = bar!(x);
} }

14
tests/ui/lint/expect-future_breakage-crash-issue-126521.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: the `#[expect]` attribute is an experimental feature error[E0658]: the `#[expect]` attribute is an experimental feature
--> $DIR/expect-future_breakage-crash-issue-126521.rs:8:5 --> $DIR/expect-future_breakage-crash-issue-126521.rs:16:5
| |
LL | #[expect(semicolon_in_expressions_from_macros)] LL | #[expect(semicolon_in_expressions_from_macros)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -8,6 +8,16 @@ LL | #[expect(semicolon_in_expressions_from_macros)]
= help: add `#![feature(lint_reasons)]` to the crate attributes to enable = help: add `#![feature(lint_reasons)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error: aborting due to 1 previous error error[E0658]: the `#[expect]` attribute is an experimental feature
--> $DIR/expect-future_breakage-crash-issue-126521.rs:20:5
|
LL | #[expect(semicolon_in_expressions_from_macros)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
= help: add `#![feature(lint_reasons)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0658`. For more information about this error, try `rustc --explain E0658`.