Auto merge of #32142 - mitaa:rdoc-maybe-inline-local, r=alexcrichton

rustdoc: improve crate-local inlining

fixes #28537

r? @alexcrichton

5 files changed, 56 insertions, 4 deletions

diff --git a/src/test/rustdoc/inline_local/issue-28537.rs b/src/test/rustdoc/inline_local/issue-28537.rs
new file mode 100644
index 00000000000..b38e104b7b4
--- /dev/null
+++ b/src/test/rustdoc/inline_local/issue-28537.rs
@@ -0,0 +1,27 @@
+// Copyright 2016 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.
+
+#[doc(hidden)]
+pub mod foo {
+    pub struct Foo;
+}
+
+mod bar {
+    pub use self::bar::Bar;
+    mod bar {
+        pub struct Bar;
+    }
+}
+
+// @has issue_28537/struct.Foo.html
+pub use foo::Foo;
+
+// @has issue_28537/struct.Bar.html
+pub use self::bar::Bar;
diff --git a/src/test/rustdoc/inline_local/please_inline.rs b/src/test/rustdoc/inline_local/please_inline.rs
new file mode 100644
index 00000000000..d237ab8dab0
--- /dev/null
+++ b/src/test/rustdoc/inline_local/please_inline.rs
@@ -0,0 +1,29 @@
+// Copyright 2016 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.
+
+pub mod foo {
+    pub struct Foo;
+}
+
+// @has please_inline/a/index.html
+pub mod a {
+    // @!has - 'pub use foo::'
+    // @has please_inline/a/struct.Foo.html
+    #[doc(inline)]
+    pub use foo::Foo;
+}
+
+// @has please_inline/b/index.html
+pub mod b {
+    // @has - 'pub use foo::'
+    // @!has please_inline/b/struct.Foo.html
+    #[feature(inline)]
+    pub use foo::Foo;
+}
diff --git a/src/test/rustdoc/recursion1.rs b/src/test/rustdoc/recursion1.rs
index 7505d20566d..00f7d90fabc 100644
--- a/src/test/rustdoc/recursion1.rs
+++ b/src/test/rustdoc/recursion1.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![crate_type = "lib"]
-#![feature(globs)]
 
 mod m {
     pub use self::a::Foo;
diff --git a/src/test/rustdoc/recursion2.rs b/src/test/rustdoc/recursion2.rs
index 7505d20566d..00f7d90fabc 100644
--- a/src/test/rustdoc/recursion2.rs
+++ b/src/test/rustdoc/recursion2.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![crate_type = "lib"]
-#![feature(globs)]
 
 mod m {
     pub use self::a::Foo;
diff --git a/src/test/rustdoc/recursion3.rs b/src/test/rustdoc/recursion3.rs
index 62a13f76ca4..1d9b903a279 100644
--- a/src/test/rustdoc/recursion3.rs
+++ b/src/test/rustdoc/recursion3.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(globs)]
-
 pub mod longhands {
     pub use super::*;