XXX: is_special/is_special_ident -> is_reserved_ident

Author: nnethercote

compiler/rustc_ast/src/token.rs

@@ -918,8 +918,8 @@ impl Token {
     }
 
     /// Returns true for reserved identifiers.
-    pub fn is_special_ident(&self) -> bool {
-        self.is_non_raw_ident_where(Ident::is_special)
+    pub fn is_reserved_ident(&self) -> bool {
+        self.is_non_raw_ident_where(Ident::is_reserved_ident)
     }
 
     /// Returns `true` if the token is a keyword used in the language.

compiler/rustc_parse/src/parser/mod.rs

@@ -423,7 +423,7 @@ pub(super) enum TokenDescription {
 impl TokenDescription {
     pub(super) fn from_token(token: &Token) -> Option<Self> {
         match token.kind {
-            _ if token.is_special_ident() => Some(TokenDescription::ReservedIdentifier),
+            _ if token.is_reserved_ident() => Some(TokenDescription::ReservedIdentifier),
             _ if token.is_used_keyword() => Some(TokenDescription::Keyword),
             _ if token.is_unused_keyword() => Some(TokenDescription::ReservedKeyword),
             token::DocComment(..) => Some(TokenDescription::DocComment),

compiler/rustc_span/src/symbol.rs

@@ -20,7 +20,7 @@ mod tests;
 
 // The proc macro code for this is in `compiler/rustc_macros/src/symbols.rs`.
 symbols! {
-    // If you modify this list, adjust `is_special`, `is_used_keyword`/`is_unused_keyword`
+    // If you modify this list, adjust `is_reserved_ident`, `is_used_keyword`/`is_unused_keyword`
     // and `AllKeywords`.
     // But this should rarely be necessary if the keywords are kept in alphabetic order.
     Keywords {
@@ -2584,7 +2584,7 @@ pub mod sym {
 }
 
 impl Symbol {
-    fn is_special(self) -> bool {
+    fn is_reserved_ident(self) -> bool {
         self == sym::dollar_crate || self == sym::underscore
     }
 
@@ -2606,7 +2606,7 @@ impl Symbol {
     }
 
     pub fn is_reserved(self, edition: impl Copy + FnOnce() -> Edition) -> bool {
-        self.is_special()
+        self.is_reserved_ident()
             || self.is_used_keyword_always()
             || self.is_unused_keyword_always()
             || self.is_used_keyword_conditional(edition)
@@ -2641,8 +2641,8 @@ impl Symbol {
 
 impl Ident {
     /// Returns `true` for reserved identifiers.
-    pub fn is_special(self) -> bool {
-        self.name.is_special()
+    pub fn is_reserved_ident(self) -> bool {
+        self.name.is_reserved_ident()
     }
 
     /// Returns `true` if the token is a keyword used in the language.