Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 17a1e04

Browse files
committedMay 26, 2022
[passes tests, mostly*] Remove Nonterminal::NtExpr.
[*] two ui tests temporarily removed, and one unit test has a couple of failing-to-parse assertions removed. XXX: - Some tests have sub-optimal error messages, I want to improve them - Added a `src` field to `Delimiter::Invisible` which indicates where it came from, partly replicates the Nonterminal kind within `Interpolated`. - parse_meta_item_inner required significant changes, it was assuming that parse_unsuffixed_lit didn't consume any tokens on failure
1 parent 551a76f commit 17a1e04

File tree

65 files changed

+405
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+405
-271
lines changed
 

‎compiler/rustc_ast/src/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@ impl MacDelimiter {
16291629
Delimiter::Parenthesis => Some(MacDelimiter::Parenthesis),
16301630
Delimiter::Bracket => Some(MacDelimiter::Bracket),
16311631
Delimiter::Brace => Some(MacDelimiter::Brace),
1632-
Delimiter::Invisible => None,
1632+
Delimiter::Invisible(_) => None,
16331633
}
16341634
}
16351635
}

‎compiler/rustc_ast/src/ast_traits.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ impl HasTokens for Nonterminal {
233233
match self {
234234
Nonterminal::NtItem(item) => item.tokens(),
235235
Nonterminal::NtStmt(stmt) => stmt.tokens(),
236-
Nonterminal::NtExpr(expr) | Nonterminal::NtLiteral(expr) => expr.tokens(),
236+
Nonterminal::NtLiteral(expr) => expr.tokens(),
237237
Nonterminal::NtPat(pat) => pat.tokens(),
238238
Nonterminal::NtTy(ty) => ty.tokens(),
239239
Nonterminal::NtMeta(attr_item) => attr_item.tokens(),
@@ -247,7 +247,7 @@ impl HasTokens for Nonterminal {
247247
match self {
248248
Nonterminal::NtItem(item) => item.tokens_mut(),
249249
Nonterminal::NtStmt(stmt) => stmt.tokens_mut(),
250-
Nonterminal::NtExpr(expr) | Nonterminal::NtLiteral(expr) => expr.tokens_mut(),
250+
Nonterminal::NtLiteral(expr) => expr.tokens_mut(),
251251
Nonterminal::NtPat(pat) => pat.tokens_mut(),
252252
Nonterminal::NtTy(ty) => ty.tokens_mut(),
253253
Nonterminal::NtMeta(attr_item) => attr_item.tokens_mut(),

0 commit comments

Comments
 (0)
Please sign in to comment.