Rollup merge of rust-lang#95645 - GuillaumeGomez:intra-doc-link-ice-t…

…raits-in-scope-primitive, r=jyn514

Fix intra doc link ICE when trying to get traits in scope for primitive

Fixes rust-lang#95633.

I think `@notriddle` was the one who worked on this part of the code last so:

r? `@notriddle`

src/librustdoc/lib.rs

@@ -771,6 +771,7 @@ 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| {
@@ -791,7 +792,12 @@ 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)
+ collect_intra_doc_links::early_resolve_intra_doc_links(
+ resolver,
+ krate,
+ externs,
+ document_private,
+ )
  });
  (resolver.clone(), resolver_caches)
  };

src/librustdoc/passes/collect_intra_doc_links/early.rs

@@ -22,6 +22,7 @@ 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,
@@ -30,6 +31,7 @@ crate fn early_resolve_intra_doc_links(
  traits_in_scope: Default::default(),
  all_traits: Default::default(),
  all_trait_impls: Default::default(),
+ document_private_items,
  };
 
  // Because of the `crate::` prefix, any doc comment can reference
@@ -66,6 +68,7 @@ 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<'_, '_> {
@@ -175,7 +178,7 @@ impl IntraLinkCrateLoader<'_, '_> {
  }
 
  for child in self.resolver.module_children_or_reexports(module_id) {
- if child.vis == Visibility::Public {
+ if child.vis == Visibility::Public || self.document_private_items {
  if let Some(def_id) = child.res.opt_def_id() {
  self.add_traits_in_parent_scope(def_id);
  }

src/test/rustdoc/issue-95633.rs

@@ -0,0 +1,7 @@
+// 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;
+}