move used_extern_options from Resolver to CStore

Author: LorrensP-2158466

compiler/rustc_metadata/src/creader.rs

@@ -70,6 +70,8 @@ pub struct CStore {
 
     /// Unused externs of the crate
     unused_externs: Vec<Symbol>,
+
+    used_extern_options: FxHashSet<Symbol>,
 }
 
 impl std::fmt::Debug for CStore {
@@ -83,7 +85,6 @@ pub struct CrateLoader<'a, 'tcx: 'a> {
     tcx: TyCtxt<'tcx>,
     // Mutable output.
     cstore: &'a mut CStore,
-    used_extern_options: &'a mut FxHashSet<Symbol>,
 }
 
 impl<'a, 'tcx> std::ops::Deref for CrateLoader<'a, 'tcx> {
@@ -495,17 +496,14 @@ impl CStore {
             has_global_allocator: false,
             has_alloc_error_handler: false,
             unused_externs: Vec::new(),
+            used_extern_options: Default::default(),
         }
     }
 }
 
 impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
-    pub fn new(
-        tcx: TyCtxt<'tcx>,
-        cstore: &'a mut CStore,
-        used_extern_options: &'a mut FxHashSet<Symbol>,
-    ) -> Self {
-        CrateLoader { tcx, cstore, used_extern_options }
+    pub fn new(tcx: TyCtxt<'tcx>, cstore: &'a mut CStore) -> Self {
+        CrateLoader { tcx, cstore }
     }
 
     fn existing_match(&self, name: Symbol, hash: Option<Svh>, kind: PathKind) -> Option<CrateNum> {
@@ -753,7 +751,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
         dep_kind: CrateDepKind,
         origin: CrateOrigin<'_>,
     ) -> Option<CrateNum> {
-        self.used_extern_options.insert(name);
+        self.cstore.used_extern_options.insert(name);
         match self.maybe_resolve_crate(name, dep_kind, origin) {
             Ok(cnum) => {
                 self.cstore.set_used_recursively(cnum);
@@ -1143,7 +1141,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
         for (name, entry) in self.sess.opts.externs.iter() {
             if entry.force {
                 let name_interned = Symbol::intern(name);
-                if !self.used_extern_options.contains(&name_interned) {
+                if !self.cstore.used_extern_options.contains(&name_interned) {
                     self.resolve_crate(
                         name_interned,
                         DUMMY_SP,
@@ -1206,7 +1204,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
                 continue;
             }
             let name_interned = Symbol::intern(name);
-            if self.used_extern_options.contains(&name_interned) {
+            if self.cstore.used_extern_options.contains(&name_interned) {
                 continue;
             }
 

compiler/rustc_resolve/src/lib.rs

@@ -1110,7 +1110,10 @@ pub struct Resolver<'ra, 'tcx> {
     builtin_types_bindings: FxHashMap<Symbol, NameBinding<'ra>>,
     builtin_attrs_bindings: FxHashMap<Symbol, NameBinding<'ra>>,
     registered_tool_bindings: FxHashMap<Ident, NameBinding<'ra>>,
-    used_extern_options: FxHashSet<Symbol>,
+    /// Binding for implicitly declared names that come with a module,
+    /// like `self` (not yet used), or `crate`/`$crate` (for root modules).
+    module_self_bindings: FxHashMap<Module<'ra>, NameBinding<'ra>>,
+
     macro_names: FxHashSet<Ident>,
     builtin_macros: FxHashMap<Symbol, SyntaxExtensionKind>,
     registered_tools: &'tcx RegisteredTools,
@@ -1546,7 +1549,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     (*ident, binding)
                 })
                 .collect(),
-            used_extern_options: Default::default(),
+            module_self_bindings,
             macro_names: FxHashSet::default(),
             builtin_macros: Default::default(),
             registered_tools,
@@ -1733,12 +1736,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         StableHashingContext::new(self.tcx.sess, self.tcx.untracked())
     }
 
-    fn crate_loader<T>(&mut self, f: impl FnOnce(&mut CrateLoader<'_, '_>) -> T) -> T {
-        f(&mut CrateLoader::new(
-            self.tcx,
-            &mut CStore::from_tcx_mut(self.tcx),
-            &mut self.used_extern_options,
-        ))
+    fn crate_loader<T>(&self, f: impl FnOnce(&mut CrateLoader<'_, '_>) -> T) -> T {
+        f(&mut CrateLoader::new(self.tcx, &mut CStore::from_tcx_mut(self.tcx)))
     }
 
     fn cstore(&self) -> FreezeReadGuard<'_, CStore> {