-
Notifications
You must be signed in to change notification settings - Fork 12.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move
PatKind::Lit
checking from ast_validation to ast lowering
Fixes #92074 This allows us to insert an `ExprKind::Err` when an invalid expression is used in a literal pattern, preventing later stages of compilation from seeing an unexpected literal pattern.
- Loading branch information
Showing
5 changed files
with
109 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
pub enum En { | ||
A(Vec<u8>) | ||
} | ||
|
||
fn get_usize() -> usize { | ||
0 | ||
} | ||
|
||
macro_rules! force_expr { | ||
($e:expr) => { $e } | ||
} | ||
|
||
macro_rules! force_pat { | ||
($a:expr, $b:expr) => { $a..=$b } | ||
} | ||
|
||
macro_rules! make_vec { | ||
() => { force_expr!(Vec::new()) } //~ ERROR arbitrary expressions aren't allowed | ||
} | ||
|
||
macro_rules! make_pat { | ||
() => { force_pat!(get_usize(), get_usize()) } | ||
//~^ ERROR arbitrary expressions aren't allowed | ||
//~| ERROR arbitrary expressions aren't allowed | ||
} | ||
|
||
#[allow(unreachable_code)] | ||
fn f() -> Result<(), impl core::fmt::Debug> { | ||
let x: En = loop {}; | ||
|
||
assert!(matches!(x, En::A(make_vec!()))); | ||
assert!(matches!(5, make_pat!())); | ||
Ok::<(), &'static str>(()) | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
error: arbitrary expressions aren't allowed in patterns | ||
--> $DIR/issue-92074-macro-ice.rs:18:25 | ||
| | ||
LL | () => { force_expr!(Vec::new()) } | ||
| ^^^^^^^^^^ | ||
... | ||
LL | assert!(matches!(x, En::A(make_vec!()))); | ||
| ----------- in this macro invocation | ||
| | ||
= note: this error originates in the macro `make_vec` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: arbitrary expressions aren't allowed in patterns | ||
--> $DIR/issue-92074-macro-ice.rs:22:24 | ||
| | ||
LL | () => { force_pat!(get_usize(), get_usize()) } | ||
| ^^^^^^^^^^^ | ||
... | ||
LL | assert!(matches!(5, make_pat!())); | ||
| ----------- in this macro invocation | ||
| | ||
= note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: arbitrary expressions aren't allowed in patterns | ||
--> $DIR/issue-92074-macro-ice.rs:22:37 | ||
| | ||
LL | () => { force_pat!(get_usize(), get_usize()) } | ||
| ^^^^^^^^^^^ | ||
... | ||
LL | assert!(matches!(5, make_pat!())); | ||
| ----------- in this macro invocation | ||
| | ||
= note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: aborting due to 3 previous errors | ||
|