From 71fe8f7cd8afa71892cb45046b11d0d3f53526a9 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Tue, 9 Jun 2020 20:12:01 -0400
Subject: [PATCH] Add test for submodules in inner crate

---
 .../intra-doc-crate/auxiliary/submodule-inner.rs      | 11 +++++++++++
 .../auxiliary/{submodule.rs => submodule-outer.rs}    |  0
 src/test/rustdoc/intra-doc-crate/submodule-inner.rs   |  6 ++++++
 .../{submodule.rs => submodule-outer.rs}              |  6 +++---
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 src/test/rustdoc/intra-doc-crate/auxiliary/submodule-inner.rs
 rename src/test/rustdoc/intra-doc-crate/auxiliary/{submodule.rs => submodule-outer.rs} (100%)
 create mode 100644 src/test/rustdoc/intra-doc-crate/submodule-inner.rs
 rename src/test/rustdoc/intra-doc-crate/{submodule.rs => submodule-outer.rs} (56%)

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
similarity index 100%
rename from src/test/rustdoc/intra-doc-crate/auxiliary/submodule.rs
rename to 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
similarity index 56%
rename from src/test/rustdoc/intra-doc-crate/submodule.rs
rename to 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};