cleanup

Author: tgross35

compiler/rustc_metadata/src/creader.rs

@@ -159,7 +159,7 @@ impl<'a> std::fmt::Debug for CrateDump<'a> {
     }
 }
 
-///
+/// Reason that a crate is being sourced as a dependency.
 #[derive(Clone, Copy)]
 enum CrateOrigin<'a> {
     /// This crate was a dependency of another crate.
@@ -168,15 +168,14 @@ enum CrateOrigin<'a> {
         /// Dependency info about this crate.
         dep: &'a CrateDep,
     },
-    ///
+    /// Injected
     Injected,
     /// An extern that has been provided with the `force` option.
     ForcedExtern,
-    ///
+    /// Part of the extern prelude.
     ExternPrelude,
-    /// Provided by `extern crate foo` or `extern crate foo as bar`.
-    #[allow(unused)]
-    AstExtern { name: Symbol, orig_name: Option<Symbol> },
+    /// Provided by `extern crate foo`.
+    AstExtern,
 }
 
 impl<'a> CrateOrigin<'a> {
@@ -458,15 +457,6 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
             return true;
         }
 
-        // if name == sym::compiler_builtins {
-        //     // compiler_builtins is an implementation detail and should never show up in
-        //     // diagnostics. `dep_root` is `None` if the requested crate came from an `extern
-        //     // crate ..`, which is the case since `compiler_builtins` is injected into AST at
-        //     // `rustc_builtin_macros::standard_library_imports::inject`.
-        //     //
-        //     // See also the note at that module referencing #113634.
-        //     return true;
-        // }
         // Any descendants of `std` should be private. These crates are usually not marked
         // private in metadata, so we ignore that field.
         if extern_private.is_none()
@@ -1052,49 +1042,18 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
             return;
         }
 
-        // let Some((cnum, _meta)) = self
-        //     .cstore
-        //     .iter_crate_data()
-        //     .find(|(_cnum, meta)| meta.name() == sym::compiler_builtins)
-        // else {
-        //     info!("`compiler_builtins` crate was not found for");
-        //     return;
-        // };
-        //
-        info!("looking for builtins in {}", self.cstore.crate_name(LOCAL_CRATE));
-
-        // self.process_extern_crate(
-        //     ast::ItemKind::ExternCrate(Some(sym::compiler_builtins)),
-        //     def_id,
-        //     definitions,
-        // )
 
         let res = self.maybe_resolve_crate(
             sym::compiler_builtins,
-            CrateDepKind::Explicit,
+            CrateDepKind::Implicit,
             CrateOrigin::Injected,
         );
 
-        info!("BUILTINS RESULT: {res:?}");
-
-        // let cnum = self
-        //     .resolve_crate(
-        //         sym::compiler_builtins,
-        //         DUMMY_SP,
-        //         CrateDepKind::Explicit,
-        //         CrateOrigin::Injected,
-        //     )
-        //     .expect("unresolved builtins");
-
-        // self.cstore.update_extern_crate(cnum, ExternCrate {
-        //     src: ExternCrateSource::Path,
-        //     // src: ExternCrateSource::Extern(def_id.to_def_id()),
-        //     span: DUMMY_SP,
-        //     path_len: "compiler_builtins".len(),
-        //     dependency_of: LOCAL_CRATE,
-        // });
-
-        // self.cstore.get_crate_data_mut(LOCAL_CRATE).add_dependency(cnum);
+        if res.is_ok() {
+            info!("`compiler_builtins` found");
+        } else {
+            info!("`compiler_builtins` not found, skipping");
+        }
     }
 
     fn inject_dependency_if(