From 572f3355663c4ec974d383e6b4973220a6965f58 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Tue, 5 Apr 2022 17:00:15 +0200
Subject: [PATCH] Revert "Fix intra doc link ICE when trying to get traits in
 scope for primitive"

---
 src/librustdoc/lib.rs                                  | 8 +-------
 src/librustdoc/passes/collect_intra_doc_links/early.rs | 5 +----
 src/test/rustdoc/issue-95633.rs                        | 7 -------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/test/rustdoc/issue-95633.rs

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 1d7a790bdb786..f59222b780d3e 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -771,7 +771,6 @@ fn main_options(options: config::Options) -> MainResult {
     let externs = options.externs.clone();
     let render_options = options.render_options.clone();
     let scrape_examples_options = options.scrape_examples_options.clone();
-    let document_private = options.render_options.document_private;
     let config = core::create_config(options);
 
     interface::create_compiler_and_run(config, |compiler| {
@@ -792,12 +791,7 @@ fn main_options(options: config::Options) -> MainResult {
             let (resolver, resolver_caches) = {
                 let (krate, resolver, _) = &*abort_on_err(queries.expansion(), sess).peek();
                 let resolver_caches = resolver.borrow_mut().access(|resolver| {
-                    collect_intra_doc_links::early_resolve_intra_doc_links(
-                        resolver,
-                        krate,
-                        externs,
-                        document_private,
-                    )
+                    collect_intra_doc_links::early_resolve_intra_doc_links(resolver, krate, externs)
                 });
                 (resolver.clone(), resolver_caches)
             };
diff --git a/src/librustdoc/passes/collect_intra_doc_links/early.rs b/src/librustdoc/passes/collect_intra_doc_links/early.rs
index 44bf86b082ad1..39900270ccb6d 100644
--- a/src/librustdoc/passes/collect_intra_doc_links/early.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links/early.rs
@@ -22,7 +22,6 @@ crate fn early_resolve_intra_doc_links(
     resolver: &mut Resolver<'_>,
     krate: &ast::Crate,
     externs: Externs,
-    document_private_items: bool,
 ) -> ResolverCaches {
     let mut loader = IntraLinkCrateLoader {
         resolver,
@@ -31,7 +30,6 @@ crate fn early_resolve_intra_doc_links(
         traits_in_scope: Default::default(),
         all_traits: Default::default(),
         all_trait_impls: Default::default(),
-        document_private_items,
     };
 
     // Overridden `visit_item` below doesn't apply to the crate root,
@@ -63,7 +61,6 @@ struct IntraLinkCrateLoader<'r, 'ra> {
     traits_in_scope: DefIdMap<Vec<TraitCandidate>>,
     all_traits: Vec<DefId>,
     all_trait_impls: Vec<DefId>,
-    document_private_items: bool,
 }
 
 impl IntraLinkCrateLoader<'_, '_> {
@@ -170,7 +167,7 @@ impl IntraLinkCrateLoader<'_, '_> {
         }
 
         for child in self.resolver.module_children_or_reexports(module_id) {
-            if child.vis == Visibility::Public || self.document_private_items {
+            if child.vis == Visibility::Public {
                 if let Some(def_id) = child.res.opt_def_id() {
                     self.add_traits_in_parent_scope(def_id);
                 }
diff --git a/src/test/rustdoc/issue-95633.rs b/src/test/rustdoc/issue-95633.rs
deleted file mode 100644
index a71d0a0373187..0000000000000
--- a/src/test/rustdoc/issue-95633.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// compile-flags: --document-private-items
-
-// This ensures that no ICE is triggered when rustdoc is run on this code.
-
-mod stdlib {
-    pub (crate) use std::i8;
-}