Auto merge of rust-lang#125828 - vincenzopalazzo:macros/performance-regression, r=<try>

bors · bors · commit d693ebad7a52 · 2024-05-31T19:01:42.000Z
[perf-only] rustc_parser: avoid checking the edition as much as possible CC rust-lang#123865 r? ghost
diff --git a/compiler/rustc_parse/src/parser/nonterminal.rs b/compiler/rustc_parse/src/parser/nonterminal.rs
@@ -47,7 +47,7 @@ impl<'a> Parser<'a> {
                 token.can_begin_expr()
                 // This exception is here for backwards compatibility.
                 && !token.is_keyword(kw::Let)
-                && (token.span.edition().at_least_rust_2024() || !token.is_keyword(kw::Const))
+                && (!token.is_keyword(kw::Const) || token.span.edition().at_least_rust_2024())
             }
             NonterminalKind::Ty => token.can_begin_type(),
             NonterminalKind::Ident => get_macro_ident(token).is_some(),

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ impl<'a> Parser<'a> {`
`47`	`47`	`token.can_begin_expr()`
`48`	`48`	`// This exception is here for backwards compatibility.`
`49`	`49`	`&& !token.is_keyword(kw::Let)`
`50`		`- && (token.span.edition().at_least_rust_2024() \|\| !token.is_keyword(kw::Const))`
	`50`	`+ && (!token.is_keyword(kw::Const) \|\| token.span.edition().at_least_rust_2024())`
`51`	`51`	`}`
`52`	`52`	`NonterminalKind::Ty => token.can_begin_type(),`
`53`	`53`	`NonterminalKind::Ident => get_macro_ident(token).is_some(),`