user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #95645 - GuillaumeGomez:intra-doc-link-ice-traits-in-scope-primitive, r=jyn514

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

Fixes #95633.

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

r? ``@notriddle``
This commit is contained in:
Dylan DPC 2022-04-05 09:33:24 +02:00 • committed by GitHub
commit bf44a87732
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/lib.rs
View file

@ -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)
};

5
src/librustdoc/passes/collect_intra_doc_links/early.rs
View file

@ -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,
};
// Overridden `visit_item` below doesn't apply to the crate root,
@ -61,6 +63,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<'_, '_> {
@ -167,7 +170,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);
}