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

Merge branch 'hide-trait-map' into rollup

Browse source
This commit is contained in:
Alex Crichton 2017-08-30 09:12:53 -07:00
commit 5c279a40ae
9 changed files with 75 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustdoc/visit_ast.rs
View file

@ -199,8 +199,9 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
self.visit_item(item, None, &mut om);
}
self.inside_public_path = orig_inside_public_path;
if let Some(exports) = self.cx.tcx.export_map.get(&id) {
for export in exports {
let hir_id = self.cx.tcx.hir.node_to_hir_id(id);
if let Some(exports) = self.cx.tcx.module_exports(hir_id) {
for export in exports.iter() {
if let Def::Macro(def_id, ..) = export.def {
if def_id.krate == LOCAL_CRATE || self.reexported_macros.contains(&def_id) {
continue // These are `krate.exported_macros`, handled in `self.visit()`.