提交 8302044a 编写于 作者: O Oliver Middleton

rustdoc: Don't import macros from private imports

上级 ee220dac
......@@ -23,6 +23,7 @@
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 @@ pub fn visit_mod_contents(&mut self, span: Span, attrs: hir::HirVec<ast::Attribu
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()`.
......
// 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'
......@@ -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 {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册