about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2020-06-09 20:12:01 -0400
committerJoshua Nelson <jyn514@gmail.com>2020-07-16 18:26:58 -0400
commit71fe8f7cd8afa71892cb45046b11d0d3f53526a9 (patch)
treeb045b1cc05abc858867595251ca32d58654831f3
parent9eb63945eb02b67e3edf4a7214c3148bffa49ed2 (diff)
downloadrust-71fe8f7cd8afa71892cb45046b11d0d3f53526a9.tar.gz
rust-71fe8f7cd8afa71892cb45046b11d0d3f53526a9.zip
Add test for submodules in inner crate
-rw-r--r--src/test/rustdoc/intra-doc-crate/auxiliary/submodule-inner.rs11
-rw-r--r--src/test/rustdoc/intra-doc-crate/auxiliary/submodule-outer.rs (renamed from src/test/rustdoc/intra-doc-crate/auxiliary/submodule.rs)0
-rw-r--r--src/test/rustdoc/intra-doc-crate/submodule-inner.rs6
-rw-r--r--src/test/rustdoc/intra-doc-crate/submodule-outer.rs (renamed from src/test/rustdoc/intra-doc-crate/submodule.rs)6
4 files changed, 20 insertions, 3 deletions
diff --git a/src/test/rustdoc/intra-doc-crate/auxiliary/submodule-inner.rs b/src/test/rustdoc/intra-doc-crate/auxiliary/submodule-inner.rs
new file mode 100644
index 00000000000..2258bb1956c
--- /dev/null
+++ b/src/test/rustdoc/intra-doc-crate/auxiliary/submodule-inner.rs
@@ -0,0 +1,11 @@
+#![crate_name = "a"]
+
+pub mod bar {
+   pub struct Bar;
+}
+
+pub mod foo {
+  use crate::bar;
+  /// link to [bar::Bar]
+  pub struct Foo;
+}
diff --git a/src/test/rustdoc/intra-doc-crate/auxiliary/submodule.rs b/src/test/rustdoc/intra-doc-crate/auxiliary/submodule-outer.rs
index dfc8685f384..dfc8685f384 100644
--- a/src/test/rustdoc/intra-doc-crate/auxiliary/submodule.rs
+++ b/src/test/rustdoc/intra-doc-crate/auxiliary/submodule-outer.rs
diff --git a/src/test/rustdoc/intra-doc-crate/submodule-inner.rs b/src/test/rustdoc/intra-doc-crate/submodule-inner.rs
new file mode 100644
index 00000000000..ab508c8792d
--- /dev/null
+++ b/src/test/rustdoc/intra-doc-crate/submodule-inner.rs
@@ -0,0 +1,6 @@
+// aux-build:submodule-inner.rs
+// build-aux-docs
+extern crate a;
+
+// @has 'submodule_inner/struct.Foo.html' '//a[@href="../a/bar/struct.Bar.html"]' 'Bar'
+pub use a::foo::Foo;
diff --git a/src/test/rustdoc/intra-doc-crate/submodule.rs b/src/test/rustdoc/intra-doc-crate/submodule-outer.rs
index 5caa220b570..3ce92cacfc2 100644
--- a/src/test/rustdoc/intra-doc-crate/submodule.rs
+++ b/src/test/rustdoc/intra-doc-crate/submodule-outer.rs
@@ -1,4 +1,4 @@
-// aux-build:submodule.rs
+// aux-build:submodule-outer.rs
 // edition:2018
 extern crate bar as bar_;
 
@@ -9,6 +9,6 @@ pub mod bar {
 
 // NOTE: we re-exported both `Foo` and `Bar` here,
 // NOTE: so they are inlined and therefore we link to the current module.
-// @has 'submodule/trait.Foo.html' '//a[@href="../submodule/bar/trait.Bar.html"]' 'Bar'
-// @has 'submodule/trait.Foo.html' '//a[@href="../submodule/trait.Baz.html"]' 'Baz'
+// @has 'submodule_outer/trait.Foo.html' '//a[@href="../submodule_outer/bar/trait.Bar.html"]' 'Bar'
+// @has 'submodule_outer/trait.Foo.html' '//a[@href="../submodule_outer/trait.Baz.html"]' 'Baz'
 pub use ::bar_::{Foo, Baz};