diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index be78935cadf..5d80611d6a2 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -23,6 +23,7 @@ use rustc::hir::def::Def; use rustc::hir::def_id::{DefId, LOCAL_CRATE}; use rustc::middle::cstore::{LoadedMacro, CrateStore}; use rustc::middle::privacy::AccessLevel; +use rustc::ty::Visibility; use rustc::util::nodemap::FxHashSet; use rustc::hir; @@ -204,7 +205,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> { self.inside_public_path = orig_inside_public_path; let def_id = self.cx.tcx.hir.local_def_id(id); if let Some(exports) = self.cx.tcx.module_exports(def_id) { - for export in exports.iter() { + for export in exports.iter().filter(|e| e.vis == Visibility::Public) { 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()`. diff --git a/src/test/rustdoc/issue-47038.rs b/src/test/rustdoc/issue-47038.rs new file mode 100644 index 00000000000..453cd663d2c --- /dev/null +++ b/src/test/rustdoc/issue-47038.rs @@ -0,0 +1,20 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(decl_macro)] + +#![crate_name = "foo"] + +use std::vec; + +// @has 'foo/index.html' +// @!has - '//*[@id="macros"]' 'Macros' +// @!has - '//a/@href' 'macro.vec.html' +// @!has 'foo/macro.vec.html' diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index 469525ae738..6458ec02669 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -158,13 +158,6 @@ fn check(cache: &mut Cache, file.ends_with("sync/struct.RwLock.html") { return None; } - // FIXME(#47038) - if file.ends_with("deriving/generic/index.html") || - file.ends_with("deriving/generic/macro.vec.html") || - file.ends_with("deriving/custom/macro.panic.html") || - file.ends_with("proc_macro_impl/macro.panic.html") { - return None; - } let res = load_file(cache, root, file, SkipRedirect); let (pretty_file, contents) = match res {