XXX: DollarCrate

Author: nnethercote

compiler/rustc_builtin_macros/src/deriving/generic/ty.rs

@@ -6,7 +6,7 @@ use rustc_ast::ptr::P;
 use rustc_ast::{self as ast, Expr, GenericArg, GenericParamKind, Generics, SelfKind};
 use rustc_expand::base::ExtCtxt;
 use rustc_span::source_map::respan;
-use rustc_span::symbol::{Ident, Symbol, kw};
+use rustc_span::symbol::{Ident, Symbol, sym};
 use rustc_span::{DUMMY_SP, Span};
 use thin_vec::ThinVec;
 
@@ -62,7 +62,7 @@ impl Path {
             PathKind::Local => cx.path_all(span, false, idents, params),
             PathKind::Std => {
                 let def_site = cx.with_def_site_ctxt(DUMMY_SP);
-                idents.insert(0, Ident::new(kw::DollarCrate, def_site));
+                idents.insert(0, Ident::new(sym::dollar_crate, def_site));
                 cx.path_all(span, false, idents, params)
             }
         }

compiler/rustc_expand/src/base.rs

@@ -25,7 +25,7 @@ use rustc_span::def_id::{CrateNum, DefId, LocalDefId};
 use rustc_span::edition::Edition;
 use rustc_span::hygiene::{AstPass, ExpnData, ExpnKind, LocalExpnId, MacroKind};
 use rustc_span::source_map::SourceMap;
-use rustc_span::symbol::{Ident, Symbol, kw, sym};
+use rustc_span::symbol::{Ident, Symbol, sym};
 use rustc_span::{DUMMY_SP, FileName, Span};
 use smallvec::{SmallVec, smallvec};
 use thin_vec::ThinVec;
@@ -1257,7 +1257,7 @@ impl<'a> ExtCtxt<'a> {
     }
     pub fn std_path(&self, components: &[Symbol]) -> Vec<Ident> {
         let def_site = self.with_def_site_ctxt(DUMMY_SP);
-        iter::once(Ident::new(kw::DollarCrate, def_site))
+        iter::once(Ident::new(sym::dollar_crate, def_site))
             .chain(components.iter().map(|&s| Ident::with_dummy_span(s)))
             .collect()
     }

compiler/rustc_expand/src/mbe/quoted.rs

@@ -248,7 +248,7 @@ fn parse_tree<'a>(
                     let (ident, is_raw) = token.ident().unwrap();
                     let span = ident.span.with_lo(dollar_span.lo());
                     if ident.name == kw::Crate && matches!(is_raw, IdentIsRaw::No) {
-                        TokenTree::token(token::Ident(kw::DollarCrate, is_raw), span)
+                        TokenTree::token(token::Ident(sym::dollar_crate, is_raw), span)
                     } else {
                         TokenTree::MetaVar(span, ident)
                     }

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -583,7 +583,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
                     }
 
                     // Disallow `use $crate;`
-                    if source.ident.name == kw::DollarCrate && module_path.is_empty() {
+                    if source.ident.name == sym::dollar_crate && module_path.is_empty() {
                         let crate_root = self.r.resolve_crate_root(source.ident);
                         let crate_name = match crate_root.kind {
                             ModuleKind::Def(.., name) => name,

compiler/rustc_resolve/src/ident.rs

@@ -850,7 +850,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             ModuleOrUniformRoot::CurrentScope => {
                 assert_eq!(shadowing, Shadowing::Unrestricted);
                 if ns == TypeNS {
-                    if ident.name == kw::Crate || ident.name == kw::DollarCrate {
+                    if ident.name == kw::Crate || ident.name == sym::dollar_crate {
                         let module = self.resolve_crate_root(ident);
                         return Ok(self.module_self_bindings[&module]);
                     } else if ident.name == kw::Super || ident.name == kw::SelfLower {
@@ -1497,7 +1497,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         module = Some(ModuleOrUniformRoot::CrateRootAndExternPrelude);
                         continue;
                     }
-                    if name == sym::path_root || name == kw::Crate || name == kw::DollarCrate {
+                    if name == sym::path_root || name == kw::Crate || name == sym::dollar_crate {
                         // `::a::b`, `crate::a::b` or `$crate::a::b`
                         let crate_root = self.resolve_crate_root(ident);
                         if let Some(res) = crate_root.res() {

compiler/rustc_resolve/src/lib.rs

@@ -1941,7 +1941,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
     fn resolve_crate_root(&mut self, ident: Ident) -> Module<'ra> {
         debug!("resolve_crate_root({:?})", ident);
         let mut ctxt = ident.span.ctxt();
-        let mark = if ident.name == kw::DollarCrate {
+        let mark = if ident.name == sym::dollar_crate {
             // When resolving `$crate` from a `macro_rules!` invoked in a `macro`,
             // we don't want to pretend that the `macro_rules!` definition is in the `macro`
             // as described in `SyntaxContext::apply_mark`, so we ignore prepended opaque marks.

compiler/rustc_resolve/src/macros.rs

@@ -188,7 +188,7 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
 
     fn resolve_dollar_crates(&mut self) {
         hygiene::update_dollar_crate_names(|ctxt| {
-            let ident = Ident::new(kw::DollarCrate, DUMMY_SP.with_ctxt(ctxt));
+            let ident = Ident::new(sym::dollar_crate, DUMMY_SP.with_ctxt(ctxt));
             match self.resolve_crate_root(ident).kind {
                 ModuleKind::Def(.., name) if name != sym::empty => name,
                 _ => kw::Crate,
@@ -749,7 +749,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             && let [segment] = path.as_slice()
             && segment.ident.span.ctxt().outer_expn_data().local_inner_macros
         {
-            let root = Ident::new(kw::DollarCrate, segment.ident.span);
+            let root = Ident::new(sym::dollar_crate, segment.ident.span);
             path.insert(0, Segment::from_ident(root));
         }
 

compiler/rustc_span/src/hygiene.rs

@@ -42,7 +42,7 @@ use tracing::{debug, trace};
 
 use crate::def_id::{CRATE_DEF_ID, CrateNum, DefId, LOCAL_CRATE, StableCrateId};
 use crate::edition::Edition;
-use crate::symbol::{Symbol, kw, sym};
+use crate::symbol::{Symbol, sym};
 use crate::{DUMMY_SP, HashStableContext, Span, SpanDecoder, SpanEncoder, with_session_globals};
 
 /// A `SyntaxContext` represents a chain of pairs `(ExpnId, Transparency)` named "marks".
@@ -366,7 +366,7 @@ impl HygieneData {
                 parent: SyntaxContext(0),
                 opaque: SyntaxContext(0),
                 opaque_and_semitransparent: SyntaxContext(0),
-                dollar_crate_name: kw::DollarCrate,
+                dollar_crate_name: sym::dollar_crate,
             }],
             syntax_context_map: FxHashMap::default(),
             expn_data_disambiguators: UnhashMap::default(),
@@ -560,7 +560,7 @@ impl HygieneData {
                         parent,
                         opaque: new_opaque,
                         opaque_and_semitransparent: new_opaque,
-                        dollar_crate_name: kw::DollarCrate,
+                        dollar_crate_name: sym::dollar_crate,
                     });
                     new_opaque
                 });
@@ -580,7 +580,7 @@ impl HygieneData {
                         parent,
                         opaque,
                         opaque_and_semitransparent: new_opaque_and_semitransparent,
-                        dollar_crate_name: kw::DollarCrate,
+                        dollar_crate_name: sym::dollar_crate,
                     });
                     new_opaque_and_semitransparent
                 });
@@ -596,7 +596,7 @@ impl HygieneData {
                 parent,
                 opaque,
                 opaque_and_semitransparent,
-                dollar_crate_name: kw::DollarCrate,
+                dollar_crate_name: sym::dollar_crate,
             });
             new_opaque_and_semitransparent_and_transparent
         })
@@ -624,7 +624,7 @@ pub fn update_dollar_crate_names(mut get_name: impl FnMut(SyntaxContext) -> Symb
             data.syntax_context_data
                 .iter()
                 .rev()
-                .take_while(|scdata| scdata.dollar_crate_name == kw::DollarCrate)
+                .take_while(|scdata| scdata.dollar_crate_name == sym::dollar_crate)
                 .count(),
         )
     });
@@ -1411,7 +1411,7 @@ pub fn decode_syntax_context<D: Decoder, F: FnOnce(&mut D, u32) -> SyntaxContext
     // Reset `dollar_crate_name` so that it will be updated by `update_dollar_crate_names`
     // We don't care what the encoding crate set this to - we want to resolve it
     // from the perspective of the current compilation session
-    ctxt_data.dollar_crate_name = kw::DollarCrate;
+    ctxt_data.dollar_crate_name = sym::dollar_crate;
 
     // Overwrite the dummy data with our decoded SyntaxContextData
     HygieneData::with(|hygiene_data| {

compiler/rustc_span/src/symbol.rs

@@ -26,7 +26,6 @@ symbols! {
     Keywords {
         // Special reserved identifiers used internally for elided lifetimes,
         // unnamed method parameters, error recovery etc.
-        DollarCrate:        "$crate",
         Underscore:         "_",
 
         // Keywords that are used in stable Rust.
@@ -771,6 +770,7 @@ symbols! {
         doc_spotlight,
         doctest,
         document_private_items,
+        dollar_crate: "$crate",
         dotdot: "..",
         dotdot_in_tuple_patterns,
         dotdoteq_in_patterns,
@@ -2354,7 +2354,7 @@ impl fmt::Display for IdentPrinter {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.is_raw {
             f.write_str("r#")?;
-        } else if self.symbol == kw::DollarCrate {
+        } else if self.symbol == sym::dollar_crate {
             if let Some(span) = self.convert_dollar_crate {
                 let converted = span.ctxt().dollar_crate_name();
                 if !converted.is_path_segment_keyword() {
@@ -2588,7 +2588,7 @@ pub mod sym {
 
 impl Symbol {
     fn is_special(self) -> bool {
-        self <= kw::Underscore
+        self == sym::dollar_crate || self == kw::Underscore
     }
 
     fn is_used_keyword_always(self) -> bool {
@@ -2623,7 +2623,7 @@ impl Symbol {
             || self == kw::SelfUpper
             || self == kw::Crate
             || self == sym::path_root
-            || self == kw::DollarCrate
+            || self == sym::dollar_crate
     }
 
     /// Returns `true` if the symbol is `true` or `false`.
@@ -2694,7 +2694,7 @@ impl AllKeywords {
     /// *Note:* Please update this if a new keyword is added beyond the current
     /// range.
     pub fn new() -> Self {
-        AllKeywords { curr_idx: kw::DollarCrate.as_u32(), end_idx: kw::Yeet.as_u32() }
+        AllKeywords { curr_idx: kw::Underscore.as_u32(), end_idx: kw::Yeet.as_u32() }
     }
 
     /// Collect all the keywords in a given edition into a vector.

src/tools/rustfmt/src/parse/macros/mod.rs

@@ -170,8 +170,7 @@ pub(crate) fn parse_expr(
     parser.parse_expr().ok()
 }
 
-const RUST_KW: [Symbol; 65] = [
-    kw::DollarCrate,
+const RUST_KW: [Symbol; 64] = [
     kw::Underscore,
     kw::As,
     kw::Break,