Force builtins to be private

Author: tgross35

compiler/rustc_builtin_macros/src/standard_library_imports.rs

@@ -53,6 +53,8 @@ pub fn inject(
             //
             // FIXME(#113634) We should inject this during post-processing like
             // we do for the panic runtime, profiler runtime, etc.
+            //
+            // See also `is_private_dep` within `rustc_metadata`.
             cx.item(
                 span,
                 Ident::new(kw::Underscore, ident_span),

compiler/rustc_metadata/src/creader.rs

@@ -404,6 +404,13 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
     fn is_private_dep(&self, name: Symbol, private_dep: Option<bool>) -> bool {
         let extern_private = self.sess.opts.externs.get(name.as_str()).map(|e| e.is_private_dep);
         debug!("name: {name}, private: {private_dep:?}, extern private: {extern_private:?}");
+        if name == sym::compiler_builtins {
+            // compiler_builtins is a private implementation detail and should never show up in
+            // diagnostics. See also the note referencing #113634 in
+            // `rustc_builtin_macros::...::inject`.
+            return true;
+        }
+
         match (extern_private, private_dep) {
             // Explicit non-private via `--extern`, explicit non-private from metadata, or
             // unspecified with default to public.

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -730,6 +730,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
     /// Constructs the reduced graph for one item.
     fn build_reduced_graph_for_item(&mut self, item: &'a Item) {
         let parent_scope = &self.parent_scope;
+        let ps2 = self.parent_scope.clone();
         let parent = parent_scope.module;
         let expansion = parent_scope.expansion;
         let ident = item.ident;
@@ -761,8 +762,8 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
 
             ItemKind::ExternCrate(orig_name) => {
                 tracing::info!(
-                    "extern crate {:?}",
-                    (&orig_name, &item, &local_def_id, &vis, &parent)
+                    "extern crate {:#?}",
+                    (ps2, parent, &orig_name, &item, &local_def_id, &vis, &parent)
                 );
                 self.build_reduced_graph_for_extern_crate(
                     orig_name,