diff options
| author | Michael Goulet <michael@errs.io> | 2024-06-19 12:21:09 -0400 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2024-06-19 12:37:49 -0400 |
| commit | 3e8898a4e1afd44f09a5a80d466cd5b1a87e0fa8 (patch) | |
| tree | 759ba772fbe6d0d5be600eaa040f085616ba56ba /compiler/rustc_parse/src | |
| parent | 50d1efa3e2aa3c1e91f9f7869225897800ce1cce (diff) | |
| download | rust-3e8898a4e1afd44f09a5a80d466cd5b1a87e0fa8.tar.gz rust-3e8898a4e1afd44f09a5a80d466cd5b1a87e0fa8.zip | |
Allow naming expr_2021 in all editions
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/nonterminal.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/parser/nonterminal.rs b/compiler/rustc_parse/src/parser/nonterminal.rs index a0b704aeea5..59f6eff07b3 100644 --- a/compiler/rustc_parse/src/parser/nonterminal.rs +++ b/compiler/rustc_parse/src/parser/nonterminal.rs @@ -36,7 +36,7 @@ impl<'a> Parser<'a> { } match kind { - NonterminalKind::Expr2021 => { + NonterminalKind::Expr2021 { inferred: _ } => { token.can_begin_expr() // This exception is here for backwards compatibility. && !token.is_keyword(kw::Let) @@ -47,7 +47,6 @@ impl<'a> Parser<'a> { token.can_begin_expr() // This exception is here for backwards compatibility. && !token.is_keyword(kw::Let) - && (!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(), @@ -149,7 +148,7 @@ impl<'a> Parser<'a> { })?) } - NonterminalKind::Expr | NonterminalKind::Expr2021 => { + NonterminalKind::Expr | NonterminalKind::Expr2021 { inferred: _ } => { NtExpr(self.parse_expr_force_collect()?) } NonterminalKind::Literal => { |