mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-22 12:37:32 +00:00
fae7785b60
Remove `token::{Open,Close}Delim`
By replacing them with `{Open,Close}{Param,Brace,Bracket,Invisible}`.
PR #137902 made `ast::TokenKind` more like `lexer::TokenKind` by
replacing the compound `BinOp{,Eq}(BinOpToken)` variants with fieldless
variants `Plus`, `Minus`, `Star`, etc. This commit does a similar thing
with delimiters. It also makes `ast::TokenKind` more similar to
`parser::TokenType`.
This requires a few new methods:
- `TokenKind::is_{,open_,close_}delim()` replace various kinds of
pattern matches.
- `Delimiter::as_{open,close}_token_kind` are used to convert
`Delimiter` values to `TokenKind`.
Despite these additions, it's a net reduction in lines of code. This is
because e.g. `token::OpenParen` is so much shorter than
`token::OpenDelim(Delimiter::Parenthesis)` that many multi-line forms
reduce to single line forms. And many places where the number of lines
doesn't change are still easier to read, just because the names are
shorter, e.g.:
```
- } else if self.token != token::CloseDelim(Delimiter::Brace) {
+ } else if self.token != token::CloseBrace {
```
r? `@petrochenkov`
|
||
|---|---|---|
| .. | ||
| attr | ||
| expand | ||
| util | ||
| ast_traits.rs | ||
| ast.rs | ||
| entry.rs | ||
| format.rs | ||
| lib.rs | ||
| mut_visit.rs | ||
| node_id.rs | ||
| ptr.rs | ||
| token.rs | ||
| tokenstream.rs | ||
| visit.rs | ||