Skip to content

Commit

Permalink
Add more missing methods to IntraLinkCrateLoader
Browse files Browse the repository at this point in the history
This helps with (but does not fix)
rust-lang#84738. I tested on
jyn514/objr@edcee7b
and still hit ICEs.

(cherry picked from commit cdafe99)
  • Loading branch information
jyn514 authored and cuviper committed Nov 16, 2021
1 parent dc73bdc commit 640bfaf
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 4 deletions.
31 changes: 27 additions & 4 deletions src/librustdoc/passes/collect_intra_doc_links/early.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use ast::visit;
use rustc_ast as ast;
use rustc_hir::def::Namespace::TypeNS;
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
Expand All @@ -16,7 +17,7 @@ crate fn load_intra_link_crates(resolver: Resolver, krate: &ast::Crate) -> Resol
let mut loader = IntraLinkCrateLoader { current_mod: CRATE_DEF_ID, resolver };
// `walk_crate` doesn't visit the crate itself for some reason.
loader.load_links_in_attrs(&krate.attrs, krate.span);
ast::visit::walk_crate(&mut loader, krate);
visit::walk_crate(&mut loader, krate);
loader.resolver
}

Expand Down Expand Up @@ -54,7 +55,12 @@ impl IntraLinkCrateLoader {
}
}

impl ast::visit::Visitor<'_> for IntraLinkCrateLoader {
impl visit::Visitor<'_> for IntraLinkCrateLoader {
fn visit_foreign_item(&mut self, item: &ast::ForeignItem) {
self.load_links_in_attrs(&item.attrs, item.span);
visit::walk_foreign_item(self, item)
}

fn visit_item(&mut self, item: &ast::Item) {
use rustc_ast_lowering::ResolverAstLowering;

Expand All @@ -64,12 +70,29 @@ impl ast::visit::Visitor<'_> for IntraLinkCrateLoader {
let old_mod = mem::replace(&mut self.current_mod, new_mod);

self.load_links_in_attrs(&item.attrs, item.span);
ast::visit::walk_item(self, item);
visit::walk_item(self, item);

self.current_mod = old_mod;
} else {
self.load_links_in_attrs(&item.attrs, item.span);
ast::visit::walk_item(self, item);
visit::walk_item(self, item);
}
}

// NOTE: if doc-comments are ever allowed on function parameters, this will have to implement `visit_param` too.

fn visit_assoc_item(&mut self, item: &ast::AssocItem, ctxt: visit::AssocCtxt) {
self.load_links_in_attrs(&item.attrs, item.span);
visit::walk_assoc_item(self, item, ctxt)
}

fn visit_field_def(&mut self, field: &ast::FieldDef) {
self.load_links_in_attrs(&field.attrs, field.span);
visit::walk_field_def(self, field)
}

fn visit_variant(&mut self, v: &ast::Variant) {
self.load_links_in_attrs(&v.attrs, v.span);
visit::walk_variant(self, v)
}
}
1 change: 1 addition & 0 deletions src/test/rustdoc-ui/intra-doc/auxiliary/dep1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// intentionally empty
1 change: 1 addition & 0 deletions src/test/rustdoc-ui/intra-doc/auxiliary/dep2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// intentionally empty
1 change: 1 addition & 0 deletions src/test/rustdoc-ui/intra-doc/auxiliary/dep3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// intentionally empty
1 change: 1 addition & 0 deletions src/test/rustdoc-ui/intra-doc/auxiliary/dep4.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// intentionally empty
26 changes: 26 additions & 0 deletions src/test/rustdoc-ui/intra-doc/extern-crate-load.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// check-pass
// aux-crate:dep1=dep1.rs
// aux-crate:dep2=dep2.rs
// aux-crate:dep3=dep3.rs
// aux-crate:dep4=dep4.rs
#![deny(rustdoc::broken_intra_doc_links)]

pub trait Trait {
/// [dep1]
type Item;
}

pub struct S {
/// [dep2]
pub x: usize,
}

extern "C" {
/// [dep3]
pub fn printf();
}

pub enum E {
/// [dep4]
A
}

0 comments on commit 640bfaf

Please sign in to comment.