Auto merge of #52196 - ollie27:rustdoc_ctor_imports, r=QuietMisdreavus
rustdoc: Hide struct and enum variant constructor imports This is fallout from #51425. The duplicate variant imports can be seen [here](https://doc.rust-lang.org/nightly/std/prelude/v1/index.html) for example. This is fixing a regression so could be backported to beta. r? @QuietMisdreavus
This commit is contained in:
commit
90bd83c9fc
@ -323,11 +323,6 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
||||
});
|
||||
true
|
||||
}
|
||||
hir_map::NodeStructCtor(_) if !glob => {
|
||||
// struct constructors always show up alongside their struct definitions, we've
|
||||
// already processed that so just discard this
|
||||
true
|
||||
}
|
||||
_ => false,
|
||||
};
|
||||
self.view_item_stack.remove(&def_node_id);
|
||||
@ -375,6 +370,13 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
||||
hir::ItemUse(ref path, kind) => {
|
||||
let is_glob = kind == hir::UseKind::Glob;
|
||||
|
||||
// struct and variant constructors always show up alongside their definitions, we've
|
||||
// already processed them so just discard these.
|
||||
match path.def {
|
||||
Def::StructCtor(..) | Def::VariantCtor(..) => return,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// If there was a private module in the current path then don't bother inlining
|
||||
// anything as it will probably be stripped anyway.
|
||||
if item.vis.node.is_pub() && self.inside_public_path {
|
||||
|
25
src/test/rustdoc/constructor-imports.rs
Normal file
25
src/test/rustdoc/constructor-imports.rs
Normal file
@ -0,0 +1,25 @@
|
||||
// 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.
|
||||
|
||||
#![crate_name = "foo"]
|
||||
|
||||
pub mod a {
|
||||
pub struct Foo;
|
||||
pub enum Bar {
|
||||
Baz,
|
||||
}
|
||||
}
|
||||
|
||||
// @count 'foo/index.html' '//*[code="pub use a::Foo;"]' 1
|
||||
#[doc(no_inline)]
|
||||
pub use a::Foo;
|
||||
// @count 'foo/index.html' '//*[code="pub use a::Bar::Baz;"]' 1
|
||||
#[doc(no_inline)]
|
||||
pub use a::Bar::Baz;
|
Loading…
Reference in New Issue
Block a user