Skip to content

Commit

Permalink
Rollup merge of rust-lang#47263 - ollie27:rustdoc_private_macro_impor…
Browse files Browse the repository at this point in the history
…t, r=GuillaumeGomez

rustdoc: Don't import macros from private imports

Fixes rust-lang#47038
  • Loading branch information
kennytm committed Jan 8, 2018
2 parents 5ffaf4c + 8302044 commit de4e1a9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/librustdoc/visit_ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()`.
Expand Down
20 changes: 20 additions & 0 deletions src/test/rustdoc/issue-47038.rs
Original file line number Diff line number Diff line change
@@ -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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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'
7 changes: 0 additions & 7 deletions src/tools/linkchecker/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit de4e1a9

Please sign in to comment.