Move tests into appropriate subdirectories

13 files changed, 5 insertions, 4 deletions

diff --git a/tests/rustdoc/pub-use-primitive-document-private-items-95633.rs b/tests/rustdoc-ui/pub-use-primitive-document-private-items-95633.rs
index 7f612a0b60a..d53a67cde8b 100644
--- a/tests/rustdoc/pub-use-primitive-document-private-items-95633.rs
+++ b/tests/rustdoc-ui/pub-use-primitive-document-private-items-95633.rs
@@ -1,3 +1,4 @@
+//@ check-pass
 //@ compile-flags: --document-private-items
 
 // This ensures that no ICE is triggered when rustdoc is run on this code.
diff --git a/tests/rustdoc/auxiliary/issue-85454.rs b/tests/rustdoc/inline_cross/auxiliary/issue-85454.rs
index 5db4fe053af..5db4fe053af 100644
--- a/tests/rustdoc/auxiliary/issue-85454.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/issue-85454.rs
diff --git a/tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs b/tests/rustdoc/inline_cross/auxiliary/reexport-with-anonymous-lifetime-98697.rs
index 4e55e7ed576..4e55e7ed576 100644
--- a/tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/reexport-with-anonymous-lifetime-98697.rs
diff --git a/tests/rustdoc/qpath-self-85454.rs b/tests/rustdoc/inline_cross/qpath-self-85454.rs
index de806db7709..de806db7709 100644
--- a/tests/rustdoc/qpath-self-85454.rs
+++ b/tests/rustdoc/inline_cross/qpath-self-85454.rs
diff --git a/tests/rustdoc/reexport-with-anonymous-lifetime-98697.rs b/tests/rustdoc/inline_cross/reexport-with-anonymous-lifetime-98697.rs
index 545af512d3d..fe6e5a39c81 100644
--- a/tests/rustdoc/reexport-with-anonymous-lifetime-98697.rs
+++ b/tests/rustdoc/inline_cross/reexport-with-anonymous-lifetime-98697.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-98697-reexport-with-anonymous-lifetime.rs
+//@ aux-build:reexport-with-anonymous-lifetime-98697.rs
 //@ ignore-cross-compile
 #![crate_name = "foo"]
 
@@ -7,12 +7,12 @@
 //
 // https://github.com/rust-lang/rust/issues/98697
 
-extern crate issue_98697_reexport_with_anonymous_lifetime;
+extern crate reexport_with_anonymous_lifetime_98697;
 
 // @has foo/fn.repro.html '//pre[@class="rust item-decl"]/code' 'fn repro<F>()where F: Fn(&str)'
 // @!has foo/fn.repro.html '//pre[@class="rust item-decl"]/code' 'for<'
-pub use issue_98697_reexport_with_anonymous_lifetime::repro;
+pub use reexport_with_anonymous_lifetime_98697::repro;
 
 // @has foo/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header"]' 'impl MyTrait<&Extra> for Extra'
 // @!has foo/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header"]' 'impl<'
-pub use issue_98697_reexport_with_anonymous_lifetime::Extra;
+pub use reexport_with_anonymous_lifetime_98697::Extra;
diff --git a/tests/rustdoc/blanket-impl-reexported-trait-94183.rs b/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs
index 343e030da9e..343e030da9e 100644
--- a/tests/rustdoc/blanket-impl-reexported-trait-94183.rs
+++ b/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs
diff --git a/tests/rustdoc/private-reexport-in-public-api-81141-2.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs
index c066f54b32b..c066f54b32b 100644
--- a/tests/rustdoc/private-reexport-in-public-api-81141-2.rs
+++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs
diff --git a/tests/rustdoc/private-export-in-public-api-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs
index d695ed7fbfa..d695ed7fbfa 100644
--- a/tests/rustdoc/private-export-in-public-api-81141.rs
+++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs
diff --git a/tests/rustdoc/private-reexport-in-public-api-generics-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs
index 1c86c769a12..1c86c769a12 100644
--- a/tests/rustdoc/private-reexport-in-public-api-generics-81141.rs
+++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs
diff --git a/tests/rustdoc/private-reexport-in-public-api-hidden-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs
index 7d6fadf26e2..7d6fadf26e2 100644
--- a/tests/rustdoc/private-reexport-in-public-api-hidden-81141.rs
+++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs
diff --git a/tests/rustdoc/private-reexport-in-public-api-private-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs
index 6bf507838d5..6bf507838d5 100644
--- a/tests/rustdoc/private-reexport-in-public-api-private-81141.rs
+++ b/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs
diff --git a/tests/rustdoc/pub-use-exported-macro-89852.rs b/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs
index cffe1289ce8..cffe1289ce8 100644
--- a/tests/rustdoc/pub-use-exported-macro-89852.rs
+++ b/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs
diff --git a/tests/rustdoc/normalize-auto-trait-80233.rs b/tests/rustdoc/synthetic_auto/normalize-auto-trait-80233.rs
index 06498018630..06498018630 100644
--- a/tests/rustdoc/normalize-auto-trait-80233.rs
+++ b/tests/rustdoc/synthetic_auto/normalize-auto-trait-80233.rs