expr_2021 should be allowed on edition 2021 and later

eholk · eholk · commit e0b7d923b490 · 2024-04-16T10:31:21.000-07:00
diff --git a/compiler/rustc_ast/src/token.rs b/compiler/rustc_ast/src/token.rs
@@ -907,7 +907,7 @@ impl NonterminalKind {
             },
             sym::pat_param => NonterminalKind::PatParam { inferred: false },
             sym::expr => NonterminalKind::Expr,
-            sym::expr_2021 if edition() >= Edition::Edition2024 => NonterminalKind::Expr2021,
+            sym::expr_2021 if edition() >= Edition::Edition2021 => NonterminalKind::Expr2021,
             sym::ty => NonterminalKind::Ty,
             sym::ident => NonterminalKind::Ident,
             sym::lifetime => NonterminalKind::Lifetime,
diff --git a/tests/ui/macros/expr_2021_old_edition.rs b/tests/ui/macros/expr_2021_old_edition.rs
@@ -1,4 +1,4 @@
-//@  compile-flags: --edition=2021
+//@  compile-flags: --edition=2018
 
 // This test ensures that expr_2021 is not allowed on pre-2024 editions
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//@ compile-flags: --edition=2021`
	`1`	`+//@ compile-flags: --edition=2018`
`2`	`2`
`3`	`3`	`// This test ensures that expr_2021 is not allowed on pre-2024 editions`
`4`	`4`