bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Allow naming expr_2021 in all editions

Browse source
This commit is contained in:
Michael Goulet 2024-06-19 12:21:09 -04:00
parent 50d1efa3e2
commit 3e8898a4e1
8 changed files with 23 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_expand/src/mbe/macro_rules.rs
View file

@ -1292,7 +1292,9 @@ fn is_in_follow(tok: &mbe::TokenTree, kind: NonterminalKind) -> IsInFollow {
// maintain
IsInFollow::Yes
}
NonterminalKind::Stmt | NonterminalKind::Expr | NonterminalKind::Expr2021 => {
NonterminalKind::Stmt
| NonterminalKind::Expr
| NonterminalKind::Expr2021 { inferred: _ } => {
const TOKENS: &[&str] = &["`=>`", "`,`", "`;`"];
match tok {
TokenTree::Token(token) => match token.kind {

3
compiler/rustc_expand/src/mbe/quoted.rs
View file

@ -113,7 +113,8 @@ pub(super) fn parse(
);
token::NonterminalKind::Ident
});
if kind == token::NonterminalKind::Expr2021
if kind
== (token::NonterminalKind::Expr2021 { inferred: false })
&& !features.expr_fragment_specifier_2024
{
rustc_session::parse::feature_err(