]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #34232 - ollie27:rustdoc_inline, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 14 Jun 2016 12:04:38 +0000 (05:04 -0700)
committerGitHub <noreply@github.com>
Tue, 14 Jun 2016 12:04:38 +0000 (05:04 -0700)
rustdoc: Don't inline #[doc(hidden)] pub use

Currently if a `#[doc(hidden)] pub use` item is inlined the `hidden`
attribute is ignored so the item can appear in the docs. By never inlining
such imports, they can be stripped.

An example in `std` is [`__OsLocalKeyInner`](https://doc.rust-lang.org/nightly/std/thread/struct.__OsLocalKeyInner.html) which clearly should not be documented.

1  2 
src/librustdoc/clean/mod.rs
src/librustdoc/visit_ast.rs

Simple merge
Simple merge