From 0f466b06d197729ebeeb72a9503f0a878749ec87 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Mon, 20 Nov 2023 11:50:18 -0700
Subject: [PATCH 1/5] rustdoc: rename `issue-\d+.rs` tests to have meaningful
 names

---
 .../rustdoc/{issue-38129.rs => doctest-crate-attributes-38129.rs} | 0
 tests/rustdoc/{issue-43153.rs => doctest-include-43153.rs}        | 0
 tests/rustdoc/{issue-38219.rs => doctest-macro-38219.rs}          | 0
 ...issue-48377.rs => doctest-markdown-trailing-docblock-48377.rs} | 0
 tests/rustdoc/{issue-46767.rs => enum-variant-private-46767.rs}   | 0
 tests/rustdoc/{issue-46766.rs => enum-variant-reexport-46766.rs}  | 0
 .../rustdoc/{issue-43701.rs => foreign-implementors-js-43701.rs}  | 0
 tests/rustdoc/{issue-34423.rs => ice-34423.rs}                    | 0
 tests/rustdoc/{issue-36031.rs => ice-36031.rs}                    | 0
 tests/rustdoc/{issue-46976.rs => ice-apit-46976.rs}               | 0
 .../{issue-48414.rs => ice-circular-intra-doc-link-48414.rs}      | 0
 tests/rustdoc/{issue-40936.rs => ice-extern-crate-40936.rs}       | 0
 .../rustdoc/{issue-46271.rs => ice-nested-extern-crate-46271.rs}  | 0
 tests/rustdoc/{issue-47639.rs => ice-nested-macro-rules-47639.rs} | 0
 tests/rustdoc/{issue-34473.rs => inline-rename-34473.rs}          | 0
 tests/rustdoc/{issue-47038.rs => private-use-decl-macro-47038.rs} | 0
 ...t-of-pub-reexport.rs => pub-reexport-of-pub-reexport-46506.rs} | 0
 tests/rustdoc/{issue-43893.rs => src-links-implementor-43893.rs}  | 0
 ...sue-45584.rs => trait-implementations-duplicate-self-45584.rs} | 0
 tests/rustdoc/{issue-34928.rs => tuple-struct-34928.rs}           | 0
 20 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/rustdoc/{issue-38129.rs => doctest-crate-attributes-38129.rs} (100%)
 rename tests/rustdoc/{issue-43153.rs => doctest-include-43153.rs} (100%)
 rename tests/rustdoc/{issue-38219.rs => doctest-macro-38219.rs} (100%)
 rename tests/rustdoc/{issue-48377.rs => doctest-markdown-trailing-docblock-48377.rs} (100%)
 rename tests/rustdoc/{issue-46767.rs => enum-variant-private-46767.rs} (100%)
 rename tests/rustdoc/{issue-46766.rs => enum-variant-reexport-46766.rs} (100%)
 rename tests/rustdoc/{issue-43701.rs => foreign-implementors-js-43701.rs} (100%)
 rename tests/rustdoc/{issue-34423.rs => ice-34423.rs} (100%)
 rename tests/rustdoc/{issue-36031.rs => ice-36031.rs} (100%)
 rename tests/rustdoc/{issue-46976.rs => ice-apit-46976.rs} (100%)
 rename tests/rustdoc/{issue-48414.rs => ice-circular-intra-doc-link-48414.rs} (100%)
 rename tests/rustdoc/{issue-40936.rs => ice-extern-crate-40936.rs} (100%)
 rename tests/rustdoc/{issue-46271.rs => ice-nested-extern-crate-46271.rs} (100%)
 rename tests/rustdoc/{issue-47639.rs => ice-nested-macro-rules-47639.rs} (100%)
 rename tests/rustdoc/{issue-34473.rs => inline-rename-34473.rs} (100%)
 rename tests/rustdoc/{issue-47038.rs => private-use-decl-macro-47038.rs} (100%)
 rename tests/rustdoc/{issue-46506-pub-reexport-of-pub-reexport.rs => pub-reexport-of-pub-reexport-46506.rs} (100%)
 rename tests/rustdoc/{issue-43893.rs => src-links-implementor-43893.rs} (100%)
 rename tests/rustdoc/{issue-45584.rs => trait-implementations-duplicate-self-45584.rs} (100%)
 rename tests/rustdoc/{issue-34928.rs => tuple-struct-34928.rs} (100%)

diff --git a/tests/rustdoc/issue-38129.rs b/tests/rustdoc/doctest-crate-attributes-38129.rs
similarity index 100%
rename from tests/rustdoc/issue-38129.rs
rename to tests/rustdoc/doctest-crate-attributes-38129.rs
diff --git a/tests/rustdoc/issue-43153.rs b/tests/rustdoc/doctest-include-43153.rs
similarity index 100%
rename from tests/rustdoc/issue-43153.rs
rename to tests/rustdoc/doctest-include-43153.rs
diff --git a/tests/rustdoc/issue-38219.rs b/tests/rustdoc/doctest-macro-38219.rs
similarity index 100%
rename from tests/rustdoc/issue-38219.rs
rename to tests/rustdoc/doctest-macro-38219.rs
diff --git a/tests/rustdoc/issue-48377.rs b/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
similarity index 100%
rename from tests/rustdoc/issue-48377.rs
rename to tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
diff --git a/tests/rustdoc/issue-46767.rs b/tests/rustdoc/enum-variant-private-46767.rs
similarity index 100%
rename from tests/rustdoc/issue-46767.rs
rename to tests/rustdoc/enum-variant-private-46767.rs
diff --git a/tests/rustdoc/issue-46766.rs b/tests/rustdoc/enum-variant-reexport-46766.rs
similarity index 100%
rename from tests/rustdoc/issue-46766.rs
rename to tests/rustdoc/enum-variant-reexport-46766.rs
diff --git a/tests/rustdoc/issue-43701.rs b/tests/rustdoc/foreign-implementors-js-43701.rs
similarity index 100%
rename from tests/rustdoc/issue-43701.rs
rename to tests/rustdoc/foreign-implementors-js-43701.rs
diff --git a/tests/rustdoc/issue-34423.rs b/tests/rustdoc/ice-34423.rs
similarity index 100%
rename from tests/rustdoc/issue-34423.rs
rename to tests/rustdoc/ice-34423.rs
diff --git a/tests/rustdoc/issue-36031.rs b/tests/rustdoc/ice-36031.rs
similarity index 100%
rename from tests/rustdoc/issue-36031.rs
rename to tests/rustdoc/ice-36031.rs
diff --git a/tests/rustdoc/issue-46976.rs b/tests/rustdoc/ice-apit-46976.rs
similarity index 100%
rename from tests/rustdoc/issue-46976.rs
rename to tests/rustdoc/ice-apit-46976.rs
diff --git a/tests/rustdoc/issue-48414.rs b/tests/rustdoc/ice-circular-intra-doc-link-48414.rs
similarity index 100%
rename from tests/rustdoc/issue-48414.rs
rename to tests/rustdoc/ice-circular-intra-doc-link-48414.rs
diff --git a/tests/rustdoc/issue-40936.rs b/tests/rustdoc/ice-extern-crate-40936.rs
similarity index 100%
rename from tests/rustdoc/issue-40936.rs
rename to tests/rustdoc/ice-extern-crate-40936.rs
diff --git a/tests/rustdoc/issue-46271.rs b/tests/rustdoc/ice-nested-extern-crate-46271.rs
similarity index 100%
rename from tests/rustdoc/issue-46271.rs
rename to tests/rustdoc/ice-nested-extern-crate-46271.rs
diff --git a/tests/rustdoc/issue-47639.rs b/tests/rustdoc/ice-nested-macro-rules-47639.rs
similarity index 100%
rename from tests/rustdoc/issue-47639.rs
rename to tests/rustdoc/ice-nested-macro-rules-47639.rs
diff --git a/tests/rustdoc/issue-34473.rs b/tests/rustdoc/inline-rename-34473.rs
similarity index 100%
rename from tests/rustdoc/issue-34473.rs
rename to tests/rustdoc/inline-rename-34473.rs
diff --git a/tests/rustdoc/issue-47038.rs b/tests/rustdoc/private-use-decl-macro-47038.rs
similarity index 100%
rename from tests/rustdoc/issue-47038.rs
rename to tests/rustdoc/private-use-decl-macro-47038.rs
diff --git a/tests/rustdoc/issue-46506-pub-reexport-of-pub-reexport.rs b/tests/rustdoc/pub-reexport-of-pub-reexport-46506.rs
similarity index 100%
rename from tests/rustdoc/issue-46506-pub-reexport-of-pub-reexport.rs
rename to tests/rustdoc/pub-reexport-of-pub-reexport-46506.rs
diff --git a/tests/rustdoc/issue-43893.rs b/tests/rustdoc/src-links-implementor-43893.rs
similarity index 100%
rename from tests/rustdoc/issue-43893.rs
rename to tests/rustdoc/src-links-implementor-43893.rs
diff --git a/tests/rustdoc/issue-45584.rs b/tests/rustdoc/trait-implementations-duplicate-self-45584.rs
similarity index 100%
rename from tests/rustdoc/issue-45584.rs
rename to tests/rustdoc/trait-implementations-duplicate-self-45584.rs
diff --git a/tests/rustdoc/issue-34928.rs b/tests/rustdoc/tuple-struct-34928.rs
similarity index 100%
rename from tests/rustdoc/issue-34928.rs
rename to tests/rustdoc/tuple-struct-34928.rs

From da7e87ef7042563f89204b4b2b4bb343e18696c5 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Mon, 20 Nov 2023 11:50:25 -0700
Subject: [PATCH 2/5] Add URL to test cases

---
 tests/rustdoc/doctest-include-43153.rs                      | 2 ++
 tests/rustdoc/doctest-macro-38219.rs                        | 2 ++
 tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs   | 2 ++
 tests/rustdoc/enum-variant-private-46767.rs                 | 1 +
 tests/rustdoc/enum-variant-reexport-46766.rs                | 1 +
 tests/rustdoc/foreign-implementors-js-43701.rs              | 1 +
 tests/rustdoc/ice-34423.rs                                  | 2 ++
 tests/rustdoc/ice-36031.rs                                  | 2 ++
 tests/rustdoc/ice-apit-46976.rs                             | 2 ++
 tests/rustdoc/ice-circular-intra-doc-link-48414.rs          | 2 ++
 tests/rustdoc/ice-extern-crate-40936.rs                     | 2 ++
 tests/rustdoc/ice-nested-extern-crate-46271.rs              | 2 ++
 tests/rustdoc/ice-nested-macro-rules-47639.rs               | 2 ++
 tests/rustdoc/inline-rename-34473.rs                        | 2 ++
 tests/rustdoc/private-use-decl-macro-47038.rs               | 2 ++
 tests/rustdoc/src-links-implementor-43893.rs                | 2 ++
 tests/rustdoc/trait-implementations-duplicate-self-45584.rs | 2 ++
 tests/rustdoc/tuple-struct-34928.rs                         | 2 ++
 18 files changed, 33 insertions(+)

diff --git a/tests/rustdoc/doctest-include-43153.rs b/tests/rustdoc/doctest-include-43153.rs
index 0fe680f10af34..ec21a68c4ee51 100644
--- a/tests/rustdoc/doctest-include-43153.rs
+++ b/tests/rustdoc/doctest-include-43153.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/43153
+
 // Test that `include!` in a doc test searches relative to the directory in
 // which the test is declared.
 
diff --git a/tests/rustdoc/doctest-macro-38219.rs b/tests/rustdoc/doctest-macro-38219.rs
index fa57c58c76184..6c81df110856e 100644
--- a/tests/rustdoc/doctest-macro-38219.rs
+++ b/tests/rustdoc/doctest-macro-38219.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/38219
+
 // compile-flags:--test
 // should-fail
 
diff --git a/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs b/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
index c32bcf380ea3b..d481dc0dd7018 100644
--- a/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
+++ b/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
@@ -1,5 +1,7 @@
 // compile-flags:--test
 
+// https://github.com/rust-lang/rust/issues/48377
+
 //! This is a doc comment
 //!
 //! ```rust
diff --git a/tests/rustdoc/enum-variant-private-46767.rs b/tests/rustdoc/enum-variant-private-46767.rs
index ef6ed104b743b..6386aa75a95e6 100644
--- a/tests/rustdoc/enum-variant-private-46767.rs
+++ b/tests/rustdoc/enum-variant-private-46767.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/46767
 #![crate_name = "foo"]
 
 mod private {
diff --git a/tests/rustdoc/enum-variant-reexport-46766.rs b/tests/rustdoc/enum-variant-reexport-46766.rs
index 36ab739565b8e..ea6b7bac4c7a3 100644
--- a/tests/rustdoc/enum-variant-reexport-46766.rs
+++ b/tests/rustdoc/enum-variant-reexport-46766.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/46766
 #![crate_name = "foo"]
 
 pub enum Enum{Variant}
diff --git a/tests/rustdoc/foreign-implementors-js-43701.rs b/tests/rustdoc/foreign-implementors-js-43701.rs
index de772881e7323..3b16ad2045a3d 100644
--- a/tests/rustdoc/foreign-implementors-js-43701.rs
+++ b/tests/rustdoc/foreign-implementors-js-43701.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/43701
 #![crate_name = "foo"]
 
 pub use std::vec::Vec;
diff --git a/tests/rustdoc/ice-34423.rs b/tests/rustdoc/ice-34423.rs
index b429bf8c9ba73..42e57ac72587c 100644
--- a/tests/rustdoc/ice-34423.rs
+++ b/tests/rustdoc/ice-34423.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/34423
+
 pub struct Foo;
 
 pub trait Bar {
diff --git a/tests/rustdoc/ice-36031.rs b/tests/rustdoc/ice-36031.rs
index af1b32fd22b17..9f091384dfeb4 100644
--- a/tests/rustdoc/ice-36031.rs
+++ b/tests/rustdoc/ice-36031.rs
@@ -2,6 +2,8 @@
 // build-aux-docs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/36031
+
 #![crate_name = "foo"]
 
 extern crate issue_36031;
diff --git a/tests/rustdoc/ice-apit-46976.rs b/tests/rustdoc/ice-apit-46976.rs
index c59f8c72e64c2..e51cee2f05637 100644
--- a/tests/rustdoc/ice-apit-46976.rs
+++ b/tests/rustdoc/ice-apit-46976.rs
@@ -1 +1,3 @@
+// https://github.com/rust-lang/rust/issues/46976
+
 pub fn ice(f: impl Fn()) {}
diff --git a/tests/rustdoc/ice-circular-intra-doc-link-48414.rs b/tests/rustdoc/ice-circular-intra-doc-link-48414.rs
index b35743d887bf3..68dda3a25bbf1 100644
--- a/tests/rustdoc/ice-circular-intra-doc-link-48414.rs
+++ b/tests/rustdoc/ice-circular-intra-doc-link-48414.rs
@@ -1,5 +1,7 @@
 // aux-build:issue-48414.rs
 
+// https://github.com/rust-lang/rust/issues/48414
+
 // ICE when resolving paths for a trait that linked to another trait, when both were in an external
 // crate
 
diff --git a/tests/rustdoc/ice-extern-crate-40936.rs b/tests/rustdoc/ice-extern-crate-40936.rs
index 4d2e4c17b1f9e..fafa45971748b 100644
--- a/tests/rustdoc/ice-extern-crate-40936.rs
+++ b/tests/rustdoc/ice-extern-crate-40936.rs
@@ -1,6 +1,8 @@
 // aux-build:issue-40936.rs
 // build-aux-docs
 
+// https://github.com/rust-lang/rust/issues/40936
+
 #![crate_name = "foo"]
 
 extern crate issue_40936;
diff --git a/tests/rustdoc/ice-nested-extern-crate-46271.rs b/tests/rustdoc/ice-nested-extern-crate-46271.rs
index b38ef20c551fb..820a63f349895 100644
--- a/tests/rustdoc/ice-nested-extern-crate-46271.rs
+++ b/tests/rustdoc/ice-nested-extern-crate-46271.rs
@@ -1,5 +1,7 @@
 // hopefully this doesn't cause an ICE
 
+// https://github.com/rust-lang/rust/issues/46271
+
 pub fn foo() {
     extern crate std;
 }
diff --git a/tests/rustdoc/ice-nested-macro-rules-47639.rs b/tests/rustdoc/ice-nested-macro-rules-47639.rs
index 4b3456b86c5e6..c38dc2810cf3e 100644
--- a/tests/rustdoc/ice-nested-macro-rules-47639.rs
+++ b/tests/rustdoc/ice-nested-macro-rules-47639.rs
@@ -1,4 +1,6 @@
 // This should not ICE
+
+// https://github.com/rust-lang/rust/issues/47639
 pub fn test() {
     macro_rules! foo {
         () => ()
diff --git a/tests/rustdoc/inline-rename-34473.rs b/tests/rustdoc/inline-rename-34473.rs
index 37da3dd199975..7bc92cca1afd1 100644
--- a/tests/rustdoc/inline-rename-34473.rs
+++ b/tests/rustdoc/inline-rename-34473.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/34473
+
 mod second {
     pub struct SomeTypeWithLongName;
 }
diff --git a/tests/rustdoc/private-use-decl-macro-47038.rs b/tests/rustdoc/private-use-decl-macro-47038.rs
index 810ddca3eab80..8944bdd42b4fb 100644
--- a/tests/rustdoc/private-use-decl-macro-47038.rs
+++ b/tests/rustdoc/private-use-decl-macro-47038.rs
@@ -2,6 +2,8 @@
 
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/47038
+
 use std::vec;
 
 // @has 'foo/index.html'
diff --git a/tests/rustdoc/src-links-implementor-43893.rs b/tests/rustdoc/src-links-implementor-43893.rs
index 95d5519345936..c16837b61297d 100644
--- a/tests/rustdoc/src-links-implementor-43893.rs
+++ b/tests/rustdoc/src-links-implementor-43893.rs
@@ -1,5 +1,7 @@
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/43893
+
 #![crate_name = "foo"]
 
 pub trait SomeTrait {}
diff --git a/tests/rustdoc/trait-implementations-duplicate-self-45584.rs b/tests/rustdoc/trait-implementations-duplicate-self-45584.rs
index 8a5f0413826a9..77b8c05f2fbe0 100644
--- a/tests/rustdoc/trait-implementations-duplicate-self-45584.rs
+++ b/tests/rustdoc/trait-implementations-duplicate-self-45584.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/45584
+
 pub trait Bar<T, U> {}
 
 // @has 'foo/struct.Foo1.html'
diff --git a/tests/rustdoc/tuple-struct-34928.rs b/tests/rustdoc/tuple-struct-34928.rs
index 4184086f622ab..909b91468931b 100644
--- a/tests/rustdoc/tuple-struct-34928.rs
+++ b/tests/rustdoc/tuple-struct-34928.rs
@@ -1,5 +1,7 @@
 #![crate_name = "foo"]
 
+// https://github.com/rust-lang/rust/issues/34928
+
 pub trait Bar {}
 
 // @has foo/struct.Foo.html '//pre' 'pub struct Foo<T>(pub T) where T: Bar;'

From cbe68435c603da438b8994c1a583b46fc01821cf Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Mon, 20 Nov 2023 11:59:29 -0700
Subject: [PATCH 3/5] Fix src link URLs for file rename

---
 tests/rustdoc/src-links-implementor-43893.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/rustdoc/src-links-implementor-43893.rs b/tests/rustdoc/src-links-implementor-43893.rs
index c16837b61297d..07e672847ca68 100644
--- a/tests/rustdoc/src-links-implementor-43893.rs
+++ b/tests/rustdoc/src-links-implementor-43893.rs
@@ -7,15 +7,15 @@
 pub trait SomeTrait {}
 pub struct SomeStruct;
 
-// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/issue-43893.rs.html#9'
+// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#11'
 impl SomeTrait for usize {}
 
-// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/issue-43893.rs.html#12-14'
+// @has foo/trait.SomeTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#14-16'
 impl SomeTrait for SomeStruct {
     // deliberately multi-line impl
 }
 
 pub trait AnotherTrait {}
 
-// @has foo/trait.AnotherTrait.html '//a/@href' '../src/foo/issue-43893.rs.html#19'
+// @has foo/trait.AnotherTrait.html '//a/@href' '../src/foo/src-links-implementor-43893.rs.html#21'
 impl<T> AnotherTrait for T {}

From fdde5c77a834c8275c23648ddaca9c18adee07d4 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Thu, 23 Nov 2023 14:54:19 -0700
Subject: [PATCH 4/5] rustdoc: move ICE tests to ui

---
 tests/{rustdoc/ice-apit-46976.rs => rustdoc-ui/apit-46976.rs}    | 1 +
 tests/{rustdoc => rustdoc-ui}/auxiliary/issue-36031.rs           | 0
 tests/{rustdoc => rustdoc-ui}/auxiliary/issue-40936.rs           | 0
 tests/{rustdoc => rustdoc-ui}/auxiliary/issue-48414.rs           | 0
 .../circular-intra-doc-link-48414.rs}                            | 1 +
 .../ice-34423.rs => rustdoc-ui/hidden-trait-method-34423.rs}     | 1 +
 .../ice-36031.rs => rustdoc-ui/inherent-assoc-consts-36031.rs}   | 1 +
 .../nested-extern-crate-46271.rs}                                | 1 +
 .../nested-macro-rules-47639.rs}                                 | 1 +
 .../ice-extern-crate-40936.rs => rustdoc-ui/super-glob-40936.rs} | 1 +
 tests/rustdoc/{ => inline_local}/enum-variant-reexport-46766.rs  | 0
 ...{tuple-struct-34928.rs => tuple-struct-where-clause-34928.rs} | 0
 12 files changed, 7 insertions(+)
 rename tests/{rustdoc/ice-apit-46976.rs => rustdoc-ui/apit-46976.rs} (84%)
 rename tests/{rustdoc => rustdoc-ui}/auxiliary/issue-36031.rs (100%)
 rename tests/{rustdoc => rustdoc-ui}/auxiliary/issue-40936.rs (100%)
 rename tests/{rustdoc => rustdoc-ui}/auxiliary/issue-48414.rs (100%)
 rename tests/{rustdoc/ice-circular-intra-doc-link-48414.rs => rustdoc-ui/circular-intra-doc-link-48414.rs} (95%)
 rename tests/{rustdoc/ice-34423.rs => rustdoc-ui/hidden-trait-method-34423.rs} (91%)
 rename tests/{rustdoc/ice-36031.rs => rustdoc-ui/inherent-assoc-consts-36031.rs} (93%)
 rename tests/{rustdoc/ice-nested-extern-crate-46271.rs => rustdoc-ui/nested-extern-crate-46271.rs} (90%)
 rename tests/{rustdoc/ice-nested-macro-rules-47639.rs => rustdoc-ui/nested-macro-rules-47639.rs} (90%)
 rename tests/{rustdoc/ice-extern-crate-40936.rs => rustdoc-ui/super-glob-40936.rs} (91%)
 rename tests/rustdoc/{ => inline_local}/enum-variant-reexport-46766.rs (100%)
 rename tests/rustdoc/{tuple-struct-34928.rs => tuple-struct-where-clause-34928.rs} (100%)

diff --git a/tests/rustdoc/ice-apit-46976.rs b/tests/rustdoc-ui/apit-46976.rs
similarity index 84%
rename from tests/rustdoc/ice-apit-46976.rs
rename to tests/rustdoc-ui/apit-46976.rs
index e51cee2f05637..c17688e3b1d74 100644
--- a/tests/rustdoc/ice-apit-46976.rs
+++ b/tests/rustdoc-ui/apit-46976.rs
@@ -1,3 +1,4 @@
+// check-pass
 // https://github.com/rust-lang/rust/issues/46976
 
 pub fn ice(f: impl Fn()) {}
diff --git a/tests/rustdoc/auxiliary/issue-36031.rs b/tests/rustdoc-ui/auxiliary/issue-36031.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-36031.rs
rename to tests/rustdoc-ui/auxiliary/issue-36031.rs
diff --git a/tests/rustdoc/auxiliary/issue-40936.rs b/tests/rustdoc-ui/auxiliary/issue-40936.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-40936.rs
rename to tests/rustdoc-ui/auxiliary/issue-40936.rs
diff --git a/tests/rustdoc/auxiliary/issue-48414.rs b/tests/rustdoc-ui/auxiliary/issue-48414.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-48414.rs
rename to tests/rustdoc-ui/auxiliary/issue-48414.rs
diff --git a/tests/rustdoc/ice-circular-intra-doc-link-48414.rs b/tests/rustdoc-ui/circular-intra-doc-link-48414.rs
similarity index 95%
rename from tests/rustdoc/ice-circular-intra-doc-link-48414.rs
rename to tests/rustdoc-ui/circular-intra-doc-link-48414.rs
index 68dda3a25bbf1..46367ccaef9a6 100644
--- a/tests/rustdoc/ice-circular-intra-doc-link-48414.rs
+++ b/tests/rustdoc-ui/circular-intra-doc-link-48414.rs
@@ -1,4 +1,5 @@
 // aux-build:issue-48414.rs
+// check-pass
 
 // https://github.com/rust-lang/rust/issues/48414
 
diff --git a/tests/rustdoc/ice-34423.rs b/tests/rustdoc-ui/hidden-trait-method-34423.rs
similarity index 91%
rename from tests/rustdoc/ice-34423.rs
rename to tests/rustdoc-ui/hidden-trait-method-34423.rs
index 42e57ac72587c..f3107d2379c9a 100644
--- a/tests/rustdoc/ice-34423.rs
+++ b/tests/rustdoc-ui/hidden-trait-method-34423.rs
@@ -1,3 +1,4 @@
+// check-pass
 // https://github.com/rust-lang/rust/issues/34423
 
 pub struct Foo;
diff --git a/tests/rustdoc/ice-36031.rs b/tests/rustdoc-ui/inherent-assoc-consts-36031.rs
similarity index 93%
rename from tests/rustdoc/ice-36031.rs
rename to tests/rustdoc-ui/inherent-assoc-consts-36031.rs
index 9f091384dfeb4..755fc1cfdff29 100644
--- a/tests/rustdoc/ice-36031.rs
+++ b/tests/rustdoc-ui/inherent-assoc-consts-36031.rs
@@ -1,4 +1,5 @@
 // aux-build:issue-36031.rs
+// check-pass
 // build-aux-docs
 // ignore-cross-compile
 
diff --git a/tests/rustdoc/ice-nested-extern-crate-46271.rs b/tests/rustdoc-ui/nested-extern-crate-46271.rs
similarity index 90%
rename from tests/rustdoc/ice-nested-extern-crate-46271.rs
rename to tests/rustdoc-ui/nested-extern-crate-46271.rs
index 820a63f349895..d2ac38f3e4559 100644
--- a/tests/rustdoc/ice-nested-extern-crate-46271.rs
+++ b/tests/rustdoc-ui/nested-extern-crate-46271.rs
@@ -1,3 +1,4 @@
+// check-pass
 // hopefully this doesn't cause an ICE
 
 // https://github.com/rust-lang/rust/issues/46271
diff --git a/tests/rustdoc/ice-nested-macro-rules-47639.rs b/tests/rustdoc-ui/nested-macro-rules-47639.rs
similarity index 90%
rename from tests/rustdoc/ice-nested-macro-rules-47639.rs
rename to tests/rustdoc-ui/nested-macro-rules-47639.rs
index c38dc2810cf3e..210b1e79cd2f5 100644
--- a/tests/rustdoc/ice-nested-macro-rules-47639.rs
+++ b/tests/rustdoc-ui/nested-macro-rules-47639.rs
@@ -1,3 +1,4 @@
+// check-pass
 // This should not ICE
 
 // https://github.com/rust-lang/rust/issues/47639
diff --git a/tests/rustdoc/ice-extern-crate-40936.rs b/tests/rustdoc-ui/super-glob-40936.rs
similarity index 91%
rename from tests/rustdoc/ice-extern-crate-40936.rs
rename to tests/rustdoc-ui/super-glob-40936.rs
index fafa45971748b..a06e977b10a59 100644
--- a/tests/rustdoc/ice-extern-crate-40936.rs
+++ b/tests/rustdoc-ui/super-glob-40936.rs
@@ -1,4 +1,5 @@
 // aux-build:issue-40936.rs
+// check-pass
 // build-aux-docs
 
 // https://github.com/rust-lang/rust/issues/40936
diff --git a/tests/rustdoc/enum-variant-reexport-46766.rs b/tests/rustdoc/inline_local/enum-variant-reexport-46766.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-reexport-46766.rs
rename to tests/rustdoc/inline_local/enum-variant-reexport-46766.rs
diff --git a/tests/rustdoc/tuple-struct-34928.rs b/tests/rustdoc/tuple-struct-where-clause-34928.rs
similarity index 100%
rename from tests/rustdoc/tuple-struct-34928.rs
rename to tests/rustdoc/tuple-struct-where-clause-34928.rs

From 4f64ff171bdd00873d6cdf8301f5cdddf999832f Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Thu, 23 Nov 2023 14:56:03 -0700
Subject: [PATCH 5/5] rustdoc: move doctest tests to folder

---
 tests/rustdoc/doctest/auxiliary/empty.rs                         | 1 +
 tests/rustdoc/{ => doctest}/doctest-cfg-feature-30252.rs         | 0
 tests/rustdoc/{ => doctest}/doctest-crate-attributes-38129.rs    | 0
 tests/rustdoc/{ => doctest}/doctest-hide-empty-line-23106.rs     | 0
 tests/rustdoc/{ => doctest}/doctest-ignore-32556.rs              | 0
 tests/rustdoc/{ => doctest}/doctest-include-43153.rs             | 0
 tests/rustdoc/{ => doctest}/doctest-macro-38219.rs               | 0
 tests/rustdoc/{ => doctest}/doctest-manual-crate-name.rs         | 0
 .../rustdoc/{ => doctest}/doctest-markdown-inline-parse-23744.rs | 0
 .../{ => doctest}/doctest-markdown-trailing-docblock-48377.rs    | 0
 .../{ => doctest}/doctest-multi-line-string-literal-25944.rs     | 0
 11 files changed, 1 insertion(+)
 create mode 100644 tests/rustdoc/doctest/auxiliary/empty.rs
 rename tests/rustdoc/{ => doctest}/doctest-cfg-feature-30252.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-crate-attributes-38129.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-hide-empty-line-23106.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-ignore-32556.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-include-43153.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-macro-38219.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-manual-crate-name.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-markdown-inline-parse-23744.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-markdown-trailing-docblock-48377.rs (100%)
 rename tests/rustdoc/{ => doctest}/doctest-multi-line-string-literal-25944.rs (100%)

diff --git a/tests/rustdoc/doctest/auxiliary/empty.rs b/tests/rustdoc/doctest/auxiliary/empty.rs
new file mode 100644
index 0000000000000..d11c69f812a8d
--- /dev/null
+++ b/tests/rustdoc/doctest/auxiliary/empty.rs
@@ -0,0 +1 @@
+// intentionally empty
diff --git a/tests/rustdoc/doctest-cfg-feature-30252.rs b/tests/rustdoc/doctest/doctest-cfg-feature-30252.rs
similarity index 100%
rename from tests/rustdoc/doctest-cfg-feature-30252.rs
rename to tests/rustdoc/doctest/doctest-cfg-feature-30252.rs
diff --git a/tests/rustdoc/doctest-crate-attributes-38129.rs b/tests/rustdoc/doctest/doctest-crate-attributes-38129.rs
similarity index 100%
rename from tests/rustdoc/doctest-crate-attributes-38129.rs
rename to tests/rustdoc/doctest/doctest-crate-attributes-38129.rs
diff --git a/tests/rustdoc/doctest-hide-empty-line-23106.rs b/tests/rustdoc/doctest/doctest-hide-empty-line-23106.rs
similarity index 100%
rename from tests/rustdoc/doctest-hide-empty-line-23106.rs
rename to tests/rustdoc/doctest/doctest-hide-empty-line-23106.rs
diff --git a/tests/rustdoc/doctest-ignore-32556.rs b/tests/rustdoc/doctest/doctest-ignore-32556.rs
similarity index 100%
rename from tests/rustdoc/doctest-ignore-32556.rs
rename to tests/rustdoc/doctest/doctest-ignore-32556.rs
diff --git a/tests/rustdoc/doctest-include-43153.rs b/tests/rustdoc/doctest/doctest-include-43153.rs
similarity index 100%
rename from tests/rustdoc/doctest-include-43153.rs
rename to tests/rustdoc/doctest/doctest-include-43153.rs
diff --git a/tests/rustdoc/doctest-macro-38219.rs b/tests/rustdoc/doctest/doctest-macro-38219.rs
similarity index 100%
rename from tests/rustdoc/doctest-macro-38219.rs
rename to tests/rustdoc/doctest/doctest-macro-38219.rs
diff --git a/tests/rustdoc/doctest-manual-crate-name.rs b/tests/rustdoc/doctest/doctest-manual-crate-name.rs
similarity index 100%
rename from tests/rustdoc/doctest-manual-crate-name.rs
rename to tests/rustdoc/doctest/doctest-manual-crate-name.rs
diff --git a/tests/rustdoc/doctest-markdown-inline-parse-23744.rs b/tests/rustdoc/doctest/doctest-markdown-inline-parse-23744.rs
similarity index 100%
rename from tests/rustdoc/doctest-markdown-inline-parse-23744.rs
rename to tests/rustdoc/doctest/doctest-markdown-inline-parse-23744.rs
diff --git a/tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs b/tests/rustdoc/doctest/doctest-markdown-trailing-docblock-48377.rs
similarity index 100%
rename from tests/rustdoc/doctest-markdown-trailing-docblock-48377.rs
rename to tests/rustdoc/doctest/doctest-markdown-trailing-docblock-48377.rs
diff --git a/tests/rustdoc/doctest-multi-line-string-literal-25944.rs b/tests/rustdoc/doctest/doctest-multi-line-string-literal-25944.rs
similarity index 100%
rename from tests/rustdoc/doctest-multi-line-string-literal-25944.rs
rename to tests/rustdoc/doctest/doctest-multi-line-string-literal-25944.rs