rustc_parser: consider the in 2024 an expression
This commit is adding the possibility to parse the `_` as an expression inside the esition 2024. Link: https://rust-lang.zulipchat.com/#narrow/stream/404510-wg-macros/topic/supporting.20.60_.60.20expressions Co-authored-by: Eric Holk <eric@theincredibleholk.org> Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
This commit is contained in:
parent
47243b335e
commit
276fa19c0a
@ -38,6 +38,7 @@ fn may_be_ident(nt: &token::Nonterminal) -> bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
match kind {
|
match kind {
|
||||||
|
// `expr_2021` and earlier
|
||||||
NonterminalKind::Expr(Expr2021 { .. }) => {
|
NonterminalKind::Expr(Expr2021 { .. }) => {
|
||||||
token.can_begin_expr()
|
token.can_begin_expr()
|
||||||
// This exception is here for backwards compatibility.
|
// This exception is here for backwards compatibility.
|
||||||
@ -45,8 +46,16 @@ fn may_be_ident(nt: &token::Nonterminal) -> bool {
|
|||||||
// This exception is here for backwards compatibility.
|
// This exception is here for backwards compatibility.
|
||||||
&& !token.is_keyword(kw::Const)
|
&& !token.is_keyword(kw::Const)
|
||||||
}
|
}
|
||||||
|
// Current edition expressions
|
||||||
NonterminalKind::Expr(Expr) => {
|
NonterminalKind::Expr(Expr) => {
|
||||||
token.can_begin_expr()
|
// In Edition 2024, `_` will be considered an expression, so we
|
||||||
|
// need to allow it here because `token.can_begin_expr()` does
|
||||||
|
// not consider `_` to be an expression.
|
||||||
|
//
|
||||||
|
// Because `can_begin_expr` is used elsewhere, we need to reduce
|
||||||
|
// the scope of where the `_` is considered an expression to
|
||||||
|
// just macro parsing code.
|
||||||
|
(token.can_begin_expr() || token.is_keyword(kw::Underscore))
|
||||||
// This exception is here for backwards compatibility.
|
// This exception is here for backwards compatibility.
|
||||||
&& !token.is_keyword(kw::Let)
|
&& !token.is_keyword(kw::Let)
|
||||||
}
|
}
|
||||||
|
32
tests/ui/macros/expr_2024_underscore_expr.edi2021.stderr
Normal file
32
tests/ui/macros/expr_2024_underscore_expr.edi2021.stderr
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
error: no rules expected the token `_`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:22:12
|
||||||
|
|
|
||||||
|
LL | macro_rules! m2021 {
|
||||||
|
| ------------------ when calling this macro
|
||||||
|
...
|
||||||
|
LL | m2021!(_);
|
||||||
|
| ^ no rules expected this token in macro call
|
||||||
|
|
|
||||||
|
note: while trying to match meta-variable `$e:expr_2021`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:10:6
|
||||||
|
|
|
||||||
|
LL | ($e:expr_2021) => {
|
||||||
|
| ^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: no rules expected the token `_`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:23:12
|
||||||
|
|
|
||||||
|
LL | macro_rules! m2024 {
|
||||||
|
| ------------------ when calling this macro
|
||||||
|
...
|
||||||
|
LL | m2024!(_);
|
||||||
|
| ^ no rules expected this token in macro call
|
||||||
|
|
|
||||||
|
note: while trying to match meta-variable `$e:expr`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:16:6
|
||||||
|
|
|
||||||
|
LL | ($e:expr) => {
|
||||||
|
| ^^^^^^^
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
17
tests/ui/macros/expr_2024_underscore_expr.edi2024.stderr
Normal file
17
tests/ui/macros/expr_2024_underscore_expr.edi2024.stderr
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
error: no rules expected the token `_`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:23:12
|
||||||
|
|
|
||||||
|
LL | macro_rules! m2021 {
|
||||||
|
| ------------------ when calling this macro
|
||||||
|
...
|
||||||
|
LL | m2021!(_);
|
||||||
|
| ^ no rules expected this token in macro call
|
||||||
|
|
|
||||||
|
note: while trying to match meta-variable `$e:expr_2021`
|
||||||
|
--> $DIR/expr_2024_underscore_expr.rs:11:6
|
||||||
|
|
|
||||||
|
LL | ($e:expr_2021) => {
|
||||||
|
| ^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
24
tests/ui/macros/expr_2024_underscore_expr.rs
Normal file
24
tests/ui/macros/expr_2024_underscore_expr.rs
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
//@ revisions: edi2021 edi2024
|
||||||
|
//@[edi2024]compile-flags: --edition=2024 -Z unstable-options
|
||||||
|
//@[edi2021]compile-flags: --edition=2021
|
||||||
|
// This test ensures that the `_` tok is considered an
|
||||||
|
// expression on edition 2024.
|
||||||
|
#![feature(expr_fragment_specifier_2024)]
|
||||||
|
#![allow(incomplete_features)]
|
||||||
|
|
||||||
|
macro_rules! m2021 {
|
||||||
|
($e:expr_2021) => {
|
||||||
|
$e = 1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! m2024 {
|
||||||
|
($e:expr) => {
|
||||||
|
$e = 1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
m2021!(_); //~ ERROR: no rules expected the token `_`
|
||||||
|
m2024!(_); //[edi2021]~ ERROR: no rules expected the token `_`
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user