Skip to content
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

Token cleanups #116649

Merged
merged 5 commits into from
Oct 12, 2023
Merged

Token cleanups #116649

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
becf494
Rename `Token::is_op` as `Token::is_punct`.
nnethercote Aug 8, 2023
129fe9a
Add a comment to `tests/ui/proc-macro/issue-75930-derive-cfg.rs`.
nnethercote Aug 8, 2023
bb9c2f5
Reorder an expression to improve readability.
nnethercote Aug 8, 2023
33aff5b
Use `TokenStream::token_alone` in one place.
nnethercote Oct 11, 2023
66c2b77
Rename `tt_prepend_space` as `space_between`.
nnethercote Oct 11, 2023
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
2 changes: 1 addition & 1 deletion compiler/rustc_ast/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ impl Token {
[DotDot, DotDotDot, DotDotEq].contains(&self.kind)
}

pub fn is_op(&self) -> bool {
pub fn is_punct(&self) -> bool {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Punct in proc macros is about punctuation characters (single-character), but op here is about operators (possibly multi-character, like +=).
But I'm also not sure how right is to call e.g. # an operator.
So renaming this is probably fine.

match self.kind {
Eq | Lt | Le | EqEq | Ne | Ge | Gt | AndAnd | OrOr | Not | Tilde | BinOp(_)
| BinOpEq(_) | At | Dot | DotDot | DotDotDot | DotDotEq | Comma | Semi | Colon
Expand Down
7 changes: 5 additions & 2 deletions compiler/rustc_parse/src/lexer/tokentrees.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ impl<'a> TokenTreesReader<'a> {
if let Some(glued) = self.token.glue(&next_tok) {
self.token = glued;
} else {
let this_spacing =
if next_tok.is_op() { Spacing::Joint } else { Spacing::Alone };
let this_spacing = if next_tok.is_punct() {
Spacing::Joint
} else {
Spacing::Alone
};
break (this_spacing, next_tok);
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_parse/src/parser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@ impl<'a> Parser<'a> {
} else if !ate_colon
&& self.may_recover()
&& (matches!(self.token.kind, token::CloseDelim(_) | token::Comma)
|| self.token.is_op())
|| self.token.is_punct())
{
let (lit, _) =
self.recover_unclosed_char(label_.ident, Parser::mk_token_lit_char, |self_| {
Expand Down