Skip to content

Commit a9c14dc

Browse files
committed
rustdoc: Use Visibility::is_public more
1 parent 7689857 commit a9c14dc

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/librustdoc/passes/collect_intra_doc_links/early.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -134,24 +134,21 @@ impl<'ra> EarlyDocLinkResolver<'_, 'ra> {
134134
// using privacy, private traits and impls from other crates are never documented in
135135
// the current crate, and links in their doc comments are not resolved.
136136
for &def_id in &all_traits {
137-
if self.resolver.cstore().visibility_untracked(def_id) == Visibility::Public {
137+
if self.resolver.cstore().visibility_untracked(def_id).is_public() {
138138
self.resolve_doc_links_extern_impl(def_id, false);
139139
}
140140
}
141141
for &(trait_def_id, impl_def_id, simplified_self_ty) in &all_trait_impls {
142-
if self.resolver.cstore().visibility_untracked(trait_def_id)
143-
== Visibility::Public
142+
if self.resolver.cstore().visibility_untracked(trait_def_id).is_public()
144143
&& simplified_self_ty.and_then(|ty| ty.def()).map_or(true, |ty_def_id| {
145-
self.resolver.cstore().visibility_untracked(ty_def_id)
146-
== Visibility::Public
144+
self.resolver.cstore().visibility_untracked(ty_def_id).is_public()
147145
})
148146
{
149147
self.resolve_doc_links_extern_impl(impl_def_id, false);
150148
}
151149
}
152150
for (ty_def_id, impl_def_id) in all_inherent_impls {
153-
if self.resolver.cstore().visibility_untracked(ty_def_id) == Visibility::Public
154-
{
151+
if self.resolver.cstore().visibility_untracked(ty_def_id).is_public() {
155152
self.resolve_doc_links_extern_impl(impl_def_id, true);
156153
}
157154
}
@@ -178,8 +175,7 @@ impl<'ra> EarlyDocLinkResolver<'_, 'ra> {
178175
self.resolver.cstore().associated_item_def_ids_untracked(def_id, self.sess),
179176
);
180177
for assoc_def_id in assoc_item_def_ids {
181-
if !is_inherent
182-
|| self.resolver.cstore().visibility_untracked(assoc_def_id) == Visibility::Public
178+
if !is_inherent || self.resolver.cstore().visibility_untracked(assoc_def_id).is_public()
183179
{
184180
self.resolve_doc_links_extern_outer(assoc_def_id, def_id);
185181
}
@@ -279,7 +275,7 @@ impl<'ra> EarlyDocLinkResolver<'_, 'ra> {
279275

280276
for child in self.resolver.module_children_or_reexports(module_id) {
281277
// This condition should give a superset of `denied` from `fn clean_use_statement`.
282-
if child.vis == Visibility::Public
278+
if child.vis.is_public()
283279
|| self.document_private_items
284280
&& child.vis != Visibility::Restricted(module_id)
285281
&& module_id.is_local()

0 commit comments

Comments
 (0)