Remove feed_local_crate in favor of creating the CrateNum via TyCtxt

Author: oli-obk

compiler/rustc_interface/src/queries.rs

@@ -143,13 +143,12 @@ impl<'tcx> Queries<'tcx> {
             )) as _);
             let definitions = FreezeLock::new(Definitions::new(stable_crate_id));
 
-            let mut stable_crate_ids = StableCrateIdMap::default();
-            stable_crate_ids.insert(stable_crate_id, LOCAL_CRATE);
+            let stable_crate_ids = FreezeLock::new(StableCrateIdMap::default());
             let untracked = Untracked {
                 cstore,
                 source_span: AppendOnlyIndexVec::new(),
                 definitions,
-                stable_crate_ids: FreezeLock::new(stable_crate_ids),
+                stable_crate_ids,
             };
 
             let qcx = passes::create_global_ctxt(
@@ -164,7 +163,8 @@ impl<'tcx> Queries<'tcx> {
             );
 
             qcx.enter(|tcx| {
-                let feed = tcx.feed_local_crate();
+                let feed = tcx.create_crate_num(stable_crate_id).unwrap();
+                assert_eq!(feed.key(), LOCAL_CRATE);
                 feed.crate_name(crate_name);
 
                 let feed = tcx.feed_unit_query();

compiler/rustc_middle/src/ty/context.rs

@@ -565,13 +565,6 @@ impl<'tcx> TyCtxt<'tcx> {
         TyCtxtFeed { tcx: self, key: () }
     }
 
-    /// Can only be fed before queries are run, and is thus exempt from any
-    /// incremental issues. Do not use except for the initial query feeding.
-    pub fn feed_local_crate(self) -> TyCtxtFeed<'tcx, CrateNum> {
-        self.dep_graph.assert_ignored();
-        TyCtxtFeed { tcx: self, key: LOCAL_CRATE }
-    }
-
     /// Only used in the resolver to register the `CRATE_DEF_ID` `DefId` and feed
     /// some queries for it. It will panic if used twice.
     pub fn create_local_crate_def_id(self, span: Span) -> TyCtxtFeed<'tcx, LocalDefId> {