Rename Token::is_op as Token::is_punct.

For consistency with `proc_macro::Punct`.

Author: nnethercote

compiler/rustc_ast/src/token.rs

@@ -404,7 +404,7 @@ impl Token {
         [DotDot, DotDotDot, DotDotEq].contains(&self.kind)
     }
 
-    pub fn is_op(&self) -> bool {
+    pub fn is_punct(&self) -> bool {
         match self.kind {
             Eq | Lt | Le | EqEq | Ne | Ge | Gt | AndAnd | OrOr | Not | Tilde | BinOp(_)
             | BinOpEq(_) | At | Dot | DotDot | DotDotDot | DotDotEq | Comma | Semi | Colon

compiler/rustc_parse/src/lexer/tokentrees.rs

@@ -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 {

compiler/rustc_parse/src/parser/expr.rs

@@ -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_| {