bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't remove export items so that we can run lints on them

Browse source
This commit is contained in:
Guillaume Gomez 2020-09-27 21:22:11 +02:00
parent fc3d8e3fcc
commit 130fd1a970
1 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/librustdoc/clean/mod.rs
View file

@ -2232,6 +2232,12 @@ impl Clean<Vec<Item>> for doctree::ExternCrate<'_> {
impl Clean<Vec<Item>> for doctree::Import<'_> { impl Clean<Vec<Item>> for doctree::Import<'_> {
fn clean(&self, cx: &DocContext<'_>) -> Vec<Item> { fn clean(&self, cx: &DocContext<'_>) -> Vec<Item> {
// We need this comparison because some imports (for std types for example)
// are "inserted" as well but directly by the compiler and they should not be
// taken into account.
if self.span.is_dummy() {
return Vec::new();
}
// We consider inlining the documentation of `pub use` statements, but we // We consider inlining the documentation of `pub use` statements, but we
// forcefully don't inline if this is not public or if the // forcefully don't inline if this is not public or if the
// #[doc(no_inline)] attribute is present. // #[doc(no_inline)] attribute is present.
@ -2254,11 +2260,20 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
let inner = if self.glob { let inner = if self.glob {
if !denied { if !denied {
let mut visited = FxHashSet::default(); let mut visited = FxHashSet::default();
if let Some(items) = inline::try_inline_glob(cx, path.res, &mut visited) { if let Some(mut items) = inline::try_inline_glob(cx, path.res, &mut visited) {
items.push(Item {
name: None,
attrs: self.attrs.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: None,
deprecation: None,
inner: ImportItem(Import::Glob(resolve_use_source(cx, path))),
});
return items; return items;
} }
} }
Import::Glob(resolve_use_source(cx, path)) Import::Glob(resolve_use_source(cx, path))
} else { } else {
let name = self.name; let name = self.name;
@ -2273,7 +2288,8 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
} }
if !denied { if !denied {
let mut visited = FxHashSet::default(); let mut visited = FxHashSet::default();
if let Some(items) = inline::try_inline(
if let Some(mut items) = inline::try_inline(
cx, cx,
cx.tcx.parent_module(self.id).to_def_id(), cx.tcx.parent_module(self.id).to_def_id(),
path.res, path.res,
@ -2281,6 +2297,19 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
Some(self.attrs), Some(self.attrs),
&mut visited, &mut visited,
) { ) {
items.push(Item {
name: None,
attrs: self.attrs.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
stability: None,
deprecation: None,
inner: ImportItem(Import::Simple(
self.name.clean(cx),
resolve_use_source(cx, path),
)),
});
return items; return items;
} }
} }