Skip to content

Interpolated cleanups #122752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 12 commits into from
Mar 21, 2024
Merged

Interpolated cleanups #122752

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
099e716
Factor out `tt` pushes.
nnethercote Mar 19, 2024
b9ead99
Rename `Token::is_path`.
nnethercote Mar 19, 2024
d919dbe
Use `maybe_whole!` to streamline `parse_attr_item`.
nnethercote Mar 19, 2024
8ac16c6
Rewrite `parse_meta_item`.
nnethercote Mar 19, 2024
d4ad322
Use `maybe_whole!` to streamline `parse_item_common`.
nnethercote Mar 19, 2024
0de050b
Use `maybe_whole!` to streamline `parse_stmt_without_recovery`.
nnethercote Mar 19, 2024
0957222
Use better variable names in some `maybe_whole!` calls.
nnethercote Mar 19, 2024
c14d9ae
Fix some formatting.
nnethercote Mar 19, 2024
dbed10a
Fix out-of-date comment.
nnethercote Mar 19, 2024
b7f3b71
Remove non-useful code path.
nnethercote Mar 19, 2024
a94bb2a
Streamline `NamedMatch`.
nnethercote Mar 19, 2024
82a609f
Shrink the comment on `TokenTree`.
nnethercote Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix some formatting.
  • Loading branch information
@nnethercote
nnethercote committed Mar 20, 2024
commit c14d9ae23e3b940c757c0775c1fc9ae21c9dcc29
8 changes: 3 additions & 5 deletions compiler/rustc_parse/src/parser/nonterminal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,14 @@ impl<'a> Parser<'a> {
token::Interpolated(nt) => may_be_ident(&nt.0),
_ => false,
},
NonterminalKind::PatParam { .. } | NonterminalKind::PatWithOr => {
match &token.kind {
NonterminalKind::PatParam { .. } | NonterminalKind::PatWithOr => match &token.kind {
token::Ident(..) | // box, ref, mut, and other identifiers (can stricten)
token::OpenDelim(Delimiter::Parenthesis) | // tuple pattern
token::OpenDelim(Delimiter::Bracket) | // slice pattern
token::BinOp(token::And) | // reference
token::BinOp(token::Minus) | // negative literal
token::AndAnd | // double reference
token::Literal(_) | // literal
token::Literal(_) | // literal
token::DotDot | // range pattern (future compat)
token::DotDotDot | // range pattern (future compat)
token::ModSep | // path
Expand All @@ -84,8 +83,7 @@ impl<'a> Parser<'a> {
token::BinOp(token::Or) => matches!(kind, NonterminalKind::PatWithOr),
token::Interpolated(nt) => may_be_ident(&nt.0),
_ => false,
}
}
},
NonterminalKind::Lifetime => match &token.kind {
token::Lifetime(_) => true,
token::Interpolated(nt) => {
Expand Down