Skip to content

Commit 6622376

Browse files
inquisitivecrystalinquisitivecrystal
committed
Use computed visibility in rustdoc
1 parent 9a987b0 commit 6622376

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

‎src/librustdoc/clean/mod.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -1881,7 +1881,7 @@ fn clean_extern_crate(
18811881
// this is the ID of the crate itself
18821882
let crate_def_id = DefId { krate: cnum, index: CRATE_DEF_INDEX };
18831883
let attrs = cx.tcx.hir().attrs(krate.hir_id());
1884-
let please_inline = krate.vis.node.is_pub()
1884+
let please_inline = cx.tcx.visibility(krate.def_id).is_public()
18851885
&& attrs.iter().any(|a| {
18861886
a.has_name(sym::doc)
18871887
&& match a.meta_item_list() {
@@ -1933,9 +1933,12 @@ fn clean_use_statement(
19331933
return Vec::new();
19341934
}
19351935

1936+
let visibility = cx.tcx.visibility(import.def_id);
19361937
let attrs = cx.tcx.hir().attrs(import.hir_id());
19371938
let inline_attr = attrs.lists(sym::doc).get_word_attr(sym::inline);
1938-
let pub_underscore = import.vis.node.is_pub() && name == kw::Underscore;
1939+
let pub_underscore = visibility.is_public() && name == kw::Underscore;
1940+
let current_mod = cx.tcx.parent_module_from_def_id(import.def_id);
1941+
let parent_mod = cx.tcx.parent_module_from_def_id(current_mod);
19391942

19401943
if pub_underscore {
19411944
if let Some(ref inline) = inline_attr {
@@ -1954,8 +1957,9 @@ fn clean_use_statement(
19541957
// forcefully don't inline if this is not public or if the
19551958
// #[doc(no_inline)] attribute is present.
19561959
// Don't inline doc(hidden) imports so they can be stripped at a later stage.
1957-
let mut denied = !(import.vis.node.is_pub()
1958-
|| (cx.render_options.document_private && import.vis.node.is_pub_restricted()))
1960+
let mut denied = !(visibility.is_public()
1961+
|| (cx.render_options.document_private
1962+
&& visibility.is_accessible_from(parent_mod.to_def_id(), cx.tcx)))
19591963
|| pub_underscore
19601964
|| attrs.iter().any(|a| {
19611965
a.has_name(sym::doc)

‎src/librustdoc/clean/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl ExternalCrate {
254254
as_keyword(Res::Def(DefKind::Mod, id.def_id.to_def_id()))
255255
}
256256
hir::ItemKind::Use(path, hir::UseKind::Single)
257-
if item.vis.node.is_pub() =>
257+
if tcx.visibility(id.def_id).is_public() =>
258258
{
259259
as_keyword(path.res.expect_non_local())
260260
.map(|(_, prim)| (id.def_id.to_def_id(), prim))
@@ -320,7 +320,7 @@ impl ExternalCrate {
320320
as_primitive(Res::Def(DefKind::Mod, id.def_id.to_def_id()))
321321
}
322322
hir::ItemKind::Use(path, hir::UseKind::Single)
323-
if item.vis.node.is_pub() =>
323+
if tcx.visibility(id.def_id).is_public() =>
324324
{
325325
as_primitive(path.res.expect_non_local()).map(|(_, prim)| {
326326
// Pretend the primitive is local.

‎src/librustdoc/visit_ast.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use rustc_hir::CRATE_HIR_ID;
1010
use rustc_middle::middle::privacy::AccessLevel;
1111
use rustc_middle::ty::TyCtxt;
1212
use rustc_span::def_id::{CRATE_DEF_ID, LOCAL_CRATE};
13-
use rustc_span::source_map::Spanned;
1413
use rustc_span::symbol::{kw, sym, Symbol};
1514

1615
use std::mem;
@@ -72,9 +71,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
7271
}
7372

7473
crate fn visit(mut self) -> Module<'tcx> {
75-
let span = self.cx.tcx.def_span(CRATE_DEF_ID);
7674
let mut top_level_module = self.visit_mod_contents(
77-
&Spanned { span, node: hir::VisibilityKind::Public },
7875
hir::CRATE_HIR_ID,
7976
self.cx.tcx.hir().root_module(),
8077
self.cx.tcx.crate_name(LOCAL_CRATE),
@@ -134,15 +131,15 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
134131

135132
fn visit_mod_contents(
136133
&mut self,
137-
vis: &hir::Visibility<'_>,
138134
id: hir::HirId,
139135
m: &'tcx hir::Mod<'tcx>,
140136
name: Symbol,
141137
) -> Module<'tcx> {
142138
let mut om = Module::new(name, id, m.inner);
139+
let def_id = self.cx.tcx.hir().local_def_id(id).to_def_id();
143140
// Keep track of if there were any private modules in the path.
144141
let orig_inside_public_path = self.inside_public_path;
145-
self.inside_public_path &= vis.node.is_pub();
142+
self.inside_public_path &= self.cx.tcx.visibility(def_id).is_public();
146143
for &i in m.item_ids {
147144
let item = self.cx.tcx.hir().item(i);
148145
self.visit_item(item, None, &mut om);
@@ -259,7 +256,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
259256
let name = renamed.unwrap_or(item.ident.name);
260257

261258
let def_id = item.def_id.to_def_id();
262-
let is_pub = item.vis.node.is_pub() || self.cx.tcx.has_attr(def_id, sym::macro_export);
259+
let is_pub = self.cx.tcx.visibility(def_id).is_public();
263260

264261
if is_pub {
265262
self.store_path(item.def_id.to_def_id());
@@ -332,7 +329,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
332329
}
333330
}
334331
hir::ItemKind::Mod(ref m) => {
335-
om.mods.push(self.visit_mod_contents(&item.vis, item.hir_id(), m, name));
332+
om.mods.push(self.visit_mod_contents(item.hir_id(), m, name));
336333
}
337334
hir::ItemKind::Fn(..)
338335
| hir::ItemKind::ExternCrate(..)
@@ -368,7 +365,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
368365
om: &mut Module<'tcx>,
369366
) {
370367
// If inlining we only want to include public functions.
371-
if !self.inlining || item.vis.node.is_pub() {
368+
if !self.inlining || self.cx.tcx.visibility(item.def_id).is_public() {
372369
om.foreigns.push((item, renamed));
373370
}
374371
}

0 commit comments

Comments
 (0)