rust-lang · bors · Apr 30, 2023 · Apr 21, 2023 · Apr 20, 2023 · Apr 27, 2023
diff --git a/tests/rustdoc-ui/check-cfg-test.stderr → ...ustdoc-ui/check-cfg/check-cfg-test.stderr b/tests/rustdoc-ui/check-cfg-test.stderr → ...ustdoc-ui/check-cfg/check-cfg-test.stderr
diff --git a/tests/rustdoc-ui/check-cfg-unstable.rs → ...ustdoc-ui/check-cfg/check-cfg-unstable.rs b/tests/rustdoc-ui/check-cfg-unstable.rs → ...ustdoc-ui/check-cfg/check-cfg-unstable.rs
diff --git a/tests/rustdoc-ui/check-cfg-unstable.stderr → ...oc-ui/check-cfg/check-cfg-unstable.stderr b/tests/rustdoc-ui/check-cfg-unstable.stderr → ...oc-ui/check-cfg/check-cfg-unstable.stderr
diff --git a/tests/rustdoc-ui/check-cfg.rs → tests/rustdoc-ui/check-cfg/check-cfg.rs b/tests/rustdoc-ui/check-cfg.rs → tests/rustdoc-ui/check-cfg/check-cfg.rs
diff --git a/tests/rustdoc-ui/check-cfg.stderr → tests/rustdoc-ui/check-cfg/check-cfg.stderr b/tests/rustdoc-ui/check-cfg.stderr → tests/rustdoc-ui/check-cfg/check-cfg.stderr
diff --git a/tests/rustdoc-ui/auxiliary/extern_macros.rs → ...doc-ui/doctest/auxiliary/extern_macros.rs b/tests/rustdoc-ui/auxiliary/extern_macros.rs → ...doc-ui/doctest/auxiliary/extern_macros.rs
diff --git a/tests/rustdoc-ui/block-doc-comment.rs → ...s/rustdoc-ui/doctest/block-doc-comment.rs b/tests/rustdoc-ui/block-doc-comment.rs → ...s/rustdoc-ui/doctest/block-doc-comment.rs
diff --git a/tests/rustdoc-ui/block-doc-comment.stdout → ...stdoc-ui/doctest/block-doc-comment.stdout b/tests/rustdoc-ui/block-doc-comment.stdout → ...stdoc-ui/doctest/block-doc-comment.stdout
diff --git a/tests/rustdoc-ui/cfg-test.rs → tests/rustdoc-ui/doctest/cfg-test.rs b/tests/rustdoc-ui/cfg-test.rs → tests/rustdoc-ui/doctest/cfg-test.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test --test-args --test-threads=1
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 // Crates like core have doctests gated on `cfg(not(test))` so we need to make

diff --git a/tests/rustdoc-ui/cfg-test.stdout → tests/rustdoc-ui/doctest/cfg-test.stdout b/tests/rustdoc-ui/cfg-test.stdout → tests/rustdoc-ui/doctest/cfg-test.stdout
diff --git a/tests/rustdoc-ui/check-attr-test.rs → tests/rustdoc-ui/doctest/check-attr-test.rs b/tests/rustdoc-ui/check-attr-test.rs → tests/rustdoc-ui/doctest/check-attr-test.rs
diff --git a/tests/rustdoc-ui/check-attr-test.stderr → ...rustdoc-ui/doctest/check-attr-test.stderr b/tests/rustdoc-ui/check-attr-test.stderr → ...rustdoc-ui/doctest/check-attr-test.stderr
diff --git a/tests/rustdoc-ui/check-cfg-test.rs → tests/rustdoc-ui/doctest/check-cfg-test.rs b/tests/rustdoc-ui/check-cfg-test.rs → tests/rustdoc-ui/doctest/check-cfg-test.rs
@@ -1,7 +1,7 @@
 // check-pass
 // compile-flags: --test --nocapture --check-cfg=values(feature,"test") -Z unstable-options
-// normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR"
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// The doctest will produce a warning because feature invalid is unexpected

diff --git a/tests/rustdoc-ui/doctest/check-cfg-test.stderr b/tests/rustdoc-ui/doctest/check-cfg-test.stderr
@@ -0,0 +1,11 @@
+warning: unexpected `cfg` condition value
+ --> $DIR/check-cfg-test.rs:9:7
+ |
+LL | #[cfg(feature = "invalid")]
+ | ^^^^^^^^^^^^^^^^^^^
+ |
+ = note: expected values for `feature` are: test
+ = note: `#[warn(unexpected_cfgs)]` on by default
+
+warning: 1 warning emitted
+
diff --git a/tests/rustdoc-ui/check-cfg-test.stdout → .../rustdoc-ui/doctest/check-cfg-test.stdout b/tests/rustdoc-ui/check-cfg-test.stdout → .../rustdoc-ui/doctest/check-cfg-test.stdout
diff --git a/tests/rustdoc-ui/display-output.rs → tests/rustdoc-ui/doctest/display-output.rs b/tests/rustdoc-ui/display-output.rs → tests/rustdoc-ui/doctest/display-output.rs
@@ -3,7 +3,7 @@
 // check-pass
 // edition:2018
 // compile-flags:--test --test-args=--show-output
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```

diff --git a/tests/rustdoc-ui/display-output.stdout → .../rustdoc-ui/doctest/display-output.stdout b/tests/rustdoc-ui/display-output.stdout → .../rustdoc-ui/doctest/display-output.stdout
diff --git a/...rustdoc-ui/doc-comment-multi-line-attr.rs → ...ui/doctest/doc-comment-multi-line-attr.rs b/...rustdoc-ui/doc-comment-multi-line-attr.rs → ...ui/doctest/doc-comment-multi-line-attr.rs
@@ -1,6 +1,6 @@
 // Regression test for #97440: Multiline inner attribute triggers ICE during doctest
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 

diff --git a/...doc-ui/doc-comment-multi-line-attr.stdout → ...octest/doc-comment-multi-line-attr.stdout b/...doc-ui/doc-comment-multi-line-attr.stdout → ...octest/doc-comment-multi-line-attr.stdout
diff --git a/...doc-ui/doc-comment-multi-line-cfg-attr.rs → ...octest/doc-comment-multi-line-cfg-attr.rs b/...doc-ui/doc-comment-multi-line-cfg-attr.rs → ...octest/doc-comment-multi-line-cfg-attr.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 

diff --git a/...ui/doc-comment-multi-line-cfg-attr.stdout → ...st/doc-comment-multi-line-cfg-attr.stdout b/...ui/doc-comment-multi-line-cfg-attr.stdout → ...st/doc-comment-multi-line-cfg-attr.stdout
diff --git a/tests/rustdoc-ui/doc-test-attr-pass.rs → .../rustdoc-ui/doctest/doc-test-attr-pass.rs b/tests/rustdoc-ui/doc-test-attr-pass.rs → .../rustdoc-ui/doctest/doc-test-attr-pass.rs
diff --git a/tests/rustdoc-ui/doc-test-attr.rs → tests/rustdoc-ui/doctest/doc-test-attr.rs b/tests/rustdoc-ui/doc-test-attr.rs → tests/rustdoc-ui/doctest/doc-test-attr.rs
diff --git a/tests/rustdoc-ui/doc-test-attr.stderr → ...s/rustdoc-ui/doctest/doc-test-attr.stderr b/tests/rustdoc-ui/doc-test-attr.stderr → ...s/rustdoc-ui/doctest/doc-test-attr.stderr
diff --git a/tests/rustdoc-ui/doc-test-doctest-feature.rs → ...oc-ui/doctest/doc-test-doctest-feature.rs b/tests/rustdoc-ui/doc-test-doctest-feature.rs → ...oc-ui/doctest/doc-test-doctest-feature.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 // Make sure `cfg(doctest)` is set when finding doctests but not inside

diff --git a/...ustdoc-ui/doc-test-doctest-feature.stdout → ...i/doctest/doc-test-doctest-feature.stdout b/...ustdoc-ui/doc-test-doctest-feature.stdout → ...i/doctest/doc-test-doctest-feature.stdout
diff --git a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs → ...oc-ui/doctest/doc-test-rustdoc-feature.rs b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs → ...oc-ui/doctest/doc-test-rustdoc-feature.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 #![feature(doc_cfg)]

diff --git a/...ustdoc-ui/doc-test-rustdoc-feature.stdout → ...i/doctest/doc-test-rustdoc-feature.stdout b/...ustdoc-ui/doc-test-rustdoc-feature.stdout → ...i/doctest/doc-test-rustdoc-feature.stdout
diff --git a/tests/rustdoc-ui/doctest-edition.rs → tests/rustdoc-ui/doctest/doctest-edition.rs b/tests/rustdoc-ui/doctest-edition.rs → tests/rustdoc-ui/doctest/doctest-edition.rs
diff --git a/tests/rustdoc-ui/doctest-edition.stderr → ...rustdoc-ui/doctest/doctest-edition.stderr b/tests/rustdoc-ui/doctest-edition.stderr → ...rustdoc-ui/doctest/doctest-edition.stderr
diff --git a/...c-ui/doctest-multiline-crate-attribute.rs → ...test/doctest-multiline-crate-attribute.rs b/...c-ui/doctest-multiline-crate-attribute.rs → ...test/doctest-multiline-crate-attribute.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test --test-args=--test-threads=1
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 

diff --git a/.../doctest-multiline-crate-attribute.stdout → .../doctest-multiline-crate-attribute.stdout b/.../doctest-multiline-crate-attribute.stdout → .../doctest-multiline-crate-attribute.stdout
diff --git a/tests/rustdoc-ui/doctest-output.rs → tests/rustdoc-ui/doctest/doctest-output.rs b/tests/rustdoc-ui/doctest-output.rs → tests/rustdoc-ui/doctest/doctest-output.rs
@@ -1,7 +1,7 @@
 // edition:2018
 // aux-build:extern_macros.rs
 // compile-flags:--test --test-args=--test-threads=1
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 

diff --git a/tests/rustdoc-ui/doctest-output.stdout → .../rustdoc-ui/doctest/doctest-output.stdout b/tests/rustdoc-ui/doctest-output.stdout → .../rustdoc-ui/doctest/doctest-output.stdout
diff --git a/...rustdoc-ui/failed-doctest-compile-fail.rs → ...ui/doctest/failed-doctest-compile-fail.rs b/...rustdoc-ui/failed-doctest-compile-fail.rs → ...ui/doctest/failed-doctest-compile-fail.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...doc-ui/failed-doctest-compile-fail.stdout → ...octest/failed-doctest-compile-fail.stdout b/...doc-ui/failed-doctest-compile-fail.stdout → ...octest/failed-doctest-compile-fail.stdout
diff --git a/...failed-doctest-extra-semicolon-on-item.rs → ...failed-doctest-extra-semicolon-on-item.rs b/...failed-doctest-extra-semicolon-on-item.rs → ...failed-doctest-extra-semicolon-on-item.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...ed-doctest-extra-semicolon-on-item.stdout → ...ed-doctest-extra-semicolon-on-item.stdout b/...ed-doctest-extra-semicolon-on-item.stdout → ...ed-doctest-extra-semicolon-on-item.stdout
diff --git a/...ustdoc-ui/failed-doctest-missing-codes.rs → ...i/doctest/failed-doctest-missing-codes.rs b/...ustdoc-ui/failed-doctest-missing-codes.rs → ...i/doctest/failed-doctest-missing-codes.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...oc-ui/failed-doctest-missing-codes.stdout → ...ctest/failed-doctest-missing-codes.stdout b/...oc-ui/failed-doctest-missing-codes.stdout → ...ctest/failed-doctest-missing-codes.stdout
diff --git a/...stdoc-ui/failed-doctest-output-windows.rs → .../doctest/failed-doctest-output-windows.rs b/...stdoc-ui/failed-doctest-output-windows.rs → .../doctest/failed-doctest-output-windows.rs
@@ -7,7 +7,7 @@
 
 // compile-flags:--test --test-args --test-threads=1
 // rustc-env:RUST_BACKTRACE=0
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...c-ui/failed-doctest-output-windows.stdout → ...test/failed-doctest-output-windows.stdout b/...c-ui/failed-doctest-output-windows.stdout → ...test/failed-doctest-output-windows.stdout
diff --git a/tests/rustdoc-ui/failed-doctest-output.rs → ...stdoc-ui/doctest/failed-doctest-output.rs b/tests/rustdoc-ui/failed-doctest-output.rs → ...stdoc-ui/doctest/failed-doctest-output.rs
@@ -7,7 +7,7 @@
 
 // compile-flags:--test --test-args --test-threads=1
 // rustc-env:RUST_BACKTRACE=0
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...s/rustdoc-ui/failed-doctest-output.stdout → ...c-ui/doctest/failed-doctest-output.stdout b/...s/rustdoc-ui/failed-doctest-output.stdout → ...c-ui/doctest/failed-doctest-output.stdout
diff --git a/...rustdoc-ui/failed-doctest-should-panic.rs → ...ui/doctest/failed-doctest-should-panic.rs b/...rustdoc-ui/failed-doctest-should-panic.rs → ...ui/doctest/failed-doctest-should-panic.rs
@@ -2,7 +2,7 @@
 // adapted to use that, and that normalize line can go away
 
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...doc-ui/failed-doctest-should-panic.stdout → ...octest/failed-doctest-should-panic.stdout b/...doc-ui/failed-doctest-should-panic.stdout → ...octest/failed-doctest-should-panic.stdout
diff --git a/tests/rustdoc-ui/no-run-flag-error.rs → ...s/rustdoc-ui/doctest/no-run-flag-error.rs b/tests/rustdoc-ui/no-run-flag-error.rs → ...s/rustdoc-ui/doctest/no-run-flag-error.rs
diff --git a/tests/rustdoc-ui/no-run-flag-error.stderr → ...stdoc-ui/doctest/no-run-flag-error.stderr b/tests/rustdoc-ui/no-run-flag-error.stderr → ...stdoc-ui/doctest/no-run-flag-error.stderr
diff --git a/tests/rustdoc-ui/no-run-flag.rs → tests/rustdoc-ui/doctest/no-run-flag.rs b/tests/rustdoc-ui/no-run-flag.rs → tests/rustdoc-ui/doctest/no-run-flag.rs
@@ -2,7 +2,7 @@
 
 // check-pass
 // compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```

diff --git a/tests/rustdoc-ui/no-run-flag.stdout → tests/rustdoc-ui/doctest/no-run-flag.stdout b/tests/rustdoc-ui/no-run-flag.stdout → tests/rustdoc-ui/doctest/no-run-flag.stdout
diff --git a/tests/rustdoc-ui/nocapture-fail.rs → tests/rustdoc-ui/doctest/nocapture-fail.rs b/tests/rustdoc-ui/nocapture-fail.rs → tests/rustdoc-ui/doctest/nocapture-fail.rs
@@ -1,7 +1,7 @@
 // check-pass
 // compile-flags:--test -Zunstable-options --nocapture
-// normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR"
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```compile_fail

diff --git a/tests/rustdoc-ui/nocapture-fail.stderr → .../rustdoc-ui/doctest/nocapture-fail.stderr b/tests/rustdoc-ui/nocapture-fail.stderr → .../rustdoc-ui/doctest/nocapture-fail.stderr
diff --git a/tests/rustdoc-ui/nocapture-fail.stdout → .../rustdoc-ui/doctest/nocapture-fail.stdout b/tests/rustdoc-ui/nocapture-fail.stdout → .../rustdoc-ui/doctest/nocapture-fail.stdout
diff --git a/tests/rustdoc-ui/nocapture.rs → tests/rustdoc-ui/doctest/nocapture.rs b/tests/rustdoc-ui/nocapture.rs → tests/rustdoc-ui/doctest/nocapture.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test -Zunstable-options --nocapture
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```

diff --git a/tests/rustdoc-ui/nocapture.stderr → tests/rustdoc-ui/doctest/nocapture.stderr b/tests/rustdoc-ui/nocapture.stderr → tests/rustdoc-ui/doctest/nocapture.stderr
diff --git a/tests/rustdoc-ui/nocapture.stdout → tests/rustdoc-ui/doctest/nocapture.stdout b/tests/rustdoc-ui/nocapture.stdout → tests/rustdoc-ui/doctest/nocapture.stdout
diff --git a/tests/rustdoc-ui/private-doc-test.rs → tests/rustdoc-ui/doctest/private-doc-test.rs b/tests/rustdoc-ui/private-doc-test.rs → tests/rustdoc-ui/doctest/private-doc-test.rs
diff --git a/tests/rustdoc-ui/private-item-doc-test.rs → ...stdoc-ui/doctest/private-item-doc-test.rs b/tests/rustdoc-ui/private-item-doc-test.rs → ...stdoc-ui/doctest/private-item-doc-test.rs
diff --git a/...s/rustdoc-ui/private-item-doc-test.stderr → ...c-ui/doctest/private-item-doc-test.stderr b/...s/rustdoc-ui/private-item-doc-test.stderr → ...c-ui/doctest/private-item-doc-test.stderr
diff --git a/...ustdoc-ui/private-public-item-doc-test.rs → ...i/doctest/private-public-item-doc-test.rs b/...ustdoc-ui/private-public-item-doc-test.rs → ...i/doctest/private-public-item-doc-test.rs
diff --git a/...oc-ui/private-public-item-doc-test.stderr → ...ctest/private-public-item-doc-test.stderr b/...oc-ui/private-public-item-doc-test.stderr → ...ctest/private-public-item-doc-test.stderr
diff --git a/...doc-ui/public-reexported-item-doc-test.rs → ...octest/public-reexported-item-doc-test.rs b/...doc-ui/public-reexported-item-doc-test.rs → ...octest/public-reexported-item-doc-test.rs
diff --git a/...s/rustdoc-ui/run-directory.correct.stdout → ...c-ui/doctest/run-directory.correct.stdout b/...s/rustdoc-ui/run-directory.correct.stdout → ...c-ui/doctest/run-directory.correct.stdout
diff --git a/...rustdoc-ui/run-directory.incorrect.stdout → ...ui/doctest/run-directory.incorrect.stdout b/...rustdoc-ui/run-directory.incorrect.stdout → ...ui/doctest/run-directory.incorrect.stdout
diff --git a/tests/rustdoc-ui/run-directory.rs → tests/rustdoc-ui/doctest/run-directory.rs b/tests/rustdoc-ui/run-directory.rs → tests/rustdoc-ui/doctest/run-directory.rs
@@ -4,20 +4,20 @@
 // check-pass
 // [correct]compile-flags:--test --test-run-directory={{src-base}}
 // [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```
 /// assert_eq!(
-/// std::fs::read_to_string("run-directory.rs").unwrap(),
+/// std::fs::read_to_string("doctest/run-directory.rs").unwrap(),
 /// include_str!("run-directory.rs"),
 /// );
 /// ```
 #[cfg(correct)]
 pub fn foo() {}
 
 /// ```
-/// assert!(std::fs::read_to_string("run-directory.rs").is_err());
+/// assert!(std::fs::read_to_string("doctest/run-directory.rs").is_err());
 /// ```
 #[cfg(incorrect)]
 pub fn foo() {}
diff --git a/tests/rustdoc-ui/test-compile-fail1.rs → .../rustdoc-ui/doctest/test-compile-fail1.rs b/tests/rustdoc-ui/test-compile-fail1.rs → .../rustdoc-ui/doctest/test-compile-fail1.rs
diff --git a/tests/rustdoc-ui/test-compile-fail1.stderr → ...tdoc-ui/doctest/test-compile-fail1.stderr b/tests/rustdoc-ui/test-compile-fail1.stderr → ...tdoc-ui/doctest/test-compile-fail1.stderr
diff --git a/tests/rustdoc-ui/test-compile-fail2.rs → .../rustdoc-ui/doctest/test-compile-fail2.rs b/tests/rustdoc-ui/test-compile-fail2.rs → .../rustdoc-ui/doctest/test-compile-fail2.rs
diff --git a/tests/rustdoc-ui/test-compile-fail2.stderr → ...tdoc-ui/doctest/test-compile-fail2.stderr b/tests/rustdoc-ui/test-compile-fail2.stderr → ...tdoc-ui/doctest/test-compile-fail2.stderr
diff --git a/tests/rustdoc-ui/test-compile-fail3.rs → .../rustdoc-ui/doctest/test-compile-fail3.rs b/tests/rustdoc-ui/test-compile-fail3.rs → .../rustdoc-ui/doctest/test-compile-fail3.rs
diff --git a/tests/rustdoc-ui/test-compile-fail3.stderr → ...tdoc-ui/doctest/test-compile-fail3.stderr b/tests/rustdoc-ui/test-compile-fail3.stderr → ...tdoc-ui/doctest/test-compile-fail3.stderr
diff --git a/tests/rustdoc-ui/test-no_std.rs → tests/rustdoc-ui/doctest/test-no_std.rs b/tests/rustdoc-ui/test-no_std.rs → tests/rustdoc-ui/doctest/test-no_std.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // check-pass
 

diff --git a/tests/rustdoc-ui/test-no_std.stdout → tests/rustdoc-ui/doctest/test-no_std.stdout b/tests/rustdoc-ui/test-no_std.stdout → tests/rustdoc-ui/doctest/test-no_std.stdout
diff --git a/tests/rustdoc-ui/test-type.rs → tests/rustdoc-ui/doctest/test-type.rs b/tests/rustdoc-ui/test-type.rs → tests/rustdoc-ui/doctest/test-type.rs
@@ -1,6 +1,6 @@
 // compile-flags: --test --test-args=--test-threads=1
 // check-pass
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 /// ```

diff --git a/tests/rustdoc-ui/test-type.stdout → tests/rustdoc-ui/doctest/test-type.stdout b/tests/rustdoc-ui/test-type.stdout → tests/rustdoc-ui/doctest/test-type.stdout
diff --git a/tests/rustdoc-ui/unparseable-doc-test.rs → ...ustdoc-ui/doctest/unparseable-doc-test.rs b/tests/rustdoc-ui/unparseable-doc-test.rs → ...ustdoc-ui/doctest/unparseable-doc-test.rs
@@ -1,5 +1,5 @@
 // compile-flags: --test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 // rustc-env: RUST_BACKTRACE=0

diff --git a/tests/rustdoc-ui/unparseable-doc-test.stdout → ...oc-ui/doctest/unparseable-doc-test.stdout b/tests/rustdoc-ui/unparseable-doc-test.stdout → ...oc-ui/doctest/unparseable-doc-test.stdout
diff --git a/...nerate-link-to-definition-opt-unstable.rs → ...nerate-link-to-definition-opt-unstable.rs b/...nerate-link-to-definition-opt-unstable.rs → ...nerate-link-to-definition-opt-unstable.rs
diff --git a/...te-link-to-definition-opt-unstable.stderr → ...te-link-to-definition-opt-unstable.stderr b/...te-link-to-definition-opt-unstable.stderr → ...te-link-to-definition-opt-unstable.stderr
diff --git a/...doc-ui/generate-link-to-definition-opt.rs → ...nition/generate-link-to-definition-opt.rs b/...doc-ui/generate-link-to-definition-opt.rs → ...nition/generate-link-to-definition-opt.rs
diff --git a/...ui/generate-link-to-definition-opt.stderr → ...on/generate-link-to-definition-opt.stderr b/...ui/generate-link-to-definition-opt.stderr → ...on/generate-link-to-definition-opt.stderr
diff --git a/...oc-ui/generate-link-to-definition-opt2.rs → ...ition/generate-link-to-definition-opt2.rs b/...oc-ui/generate-link-to-definition-opt2.rs → ...ition/generate-link-to-definition-opt2.rs
diff --git a/...i/generate-link-to-definition-opt2.stderr → ...n/generate-link-to-definition-opt2.stderr b/...i/generate-link-to-definition-opt2.stderr → ...n/generate-link-to-definition-opt2.stderr
diff --git a/tests/rustdoc-ui/assoc-item-not-in-scope.rs → ...c-ui/intra-doc/assoc-item-not-in-scope.rs b/tests/rustdoc-ui/assoc-item-not-in-scope.rs → ...c-ui/intra-doc/assoc-item-not-in-scope.rs
diff --git a/...rustdoc-ui/assoc-item-not-in-scope.stderr → .../intra-doc/assoc-item-not-in-scope.stderr b/...rustdoc-ui/assoc-item-not-in-scope.stderr → .../intra-doc/assoc-item-not-in-scope.stderr
diff --git a/...-ui/deny-intra-link-resolution-failure.rs → ...doc/deny-intra-link-resolution-failure.rs b/...-ui/deny-intra-link-resolution-failure.rs → ...doc/deny-intra-link-resolution-failure.rs
diff --git a/...deny-intra-link-resolution-failure.stderr → ...deny-intra-link-resolution-failure.stderr b/...deny-intra-link-resolution-failure.stderr → ...deny-intra-link-resolution-failure.stderr
diff --git a/tests/rustdoc-ui/pub-export-lint.rs → ...s/rustdoc-ui/intra-doc/pub-export-lint.rs b/tests/rustdoc-ui/pub-export-lint.rs → ...s/rustdoc-ui/intra-doc/pub-export-lint.rs
diff --git a/tests/rustdoc-ui/pub-export-lint.stderr → ...stdoc-ui/intra-doc/pub-export-lint.stderr b/tests/rustdoc-ui/pub-export-lint.stderr → ...stdoc-ui/intra-doc/pub-export-lint.stderr
diff --git a/...c-ui/reference-link-reports-error-once.rs → ...-doc/reference-link-reports-error-once.rs b/...c-ui/reference-link-reports-error-once.rs → ...-doc/reference-link-reports-error-once.rs
diff --git a/.../reference-link-reports-error-once.stderr → .../reference-link-reports-error-once.stderr b/.../reference-link-reports-error-once.stderr → .../reference-link-reports-error-once.stderr
diff --git a/tests/rustdoc-ui/reference-links.rs → ...s/rustdoc-ui/intra-doc/reference-links.rs b/tests/rustdoc-ui/reference-links.rs → ...s/rustdoc-ui/intra-doc/reference-links.rs
diff --git a/tests/rustdoc-ui/reference-links.stderr → ...stdoc-ui/intra-doc/reference-links.stderr b/tests/rustdoc-ui/reference-links.stderr → ...stdoc-ui/intra-doc/reference-links.stderr
diff --git a/tests/rustdoc-ui/auxiliary/empty-fn.rs → ...s/rustdoc-ui/issues/auxiliary/empty-fn.rs b/tests/rustdoc-ui/auxiliary/empty-fn.rs → ...s/rustdoc-ui/issues/auxiliary/empty-fn.rs
diff --git a/tests/rustdoc-ui/auxiliary/issue-61592.rs → ...ustdoc-ui/issues/auxiliary/issue-61592.rs b/tests/rustdoc-ui/auxiliary/issue-61592.rs → ...ustdoc-ui/issues/auxiliary/issue-61592.rs
diff --git a/tests/rustdoc-ui/auxiliary/panic-handler.rs → ...tdoc-ui/issues/auxiliary/panic-handler.rs b/tests/rustdoc-ui/auxiliary/panic-handler.rs → ...tdoc-ui/issues/auxiliary/panic-handler.rs
diff --git a/tests/rustdoc-ui/issue-101076.rs → tests/rustdoc-ui/issues/issue-101076.rs b/tests/rustdoc-ui/issue-101076.rs → tests/rustdoc-ui/issues/issue-101076.rs
diff --git a/tests/rustdoc-ui/issue-102986.rs → tests/rustdoc-ui/issues/issue-102986.rs b/tests/rustdoc-ui/issue-102986.rs → tests/rustdoc-ui/issues/issue-102986.rs
diff --git a/tests/rustdoc-ui/issue-102986.stderr → tests/rustdoc-ui/issues/issue-102986.stderr b/tests/rustdoc-ui/issue-102986.stderr → tests/rustdoc-ui/issues/issue-102986.stderr
diff --git a/tests/rustdoc-ui/issue-103997.rs → tests/rustdoc-ui/issues/issue-103997.rs b/tests/rustdoc-ui/issue-103997.rs → tests/rustdoc-ui/issues/issue-103997.rs
diff --git a/tests/rustdoc-ui/issue-103997.stderr → tests/rustdoc-ui/issues/issue-103997.stderr b/tests/rustdoc-ui/issue-103997.stderr → tests/rustdoc-ui/issues/issue-103997.stderr
diff --git a/tests/rustdoc-ui/issue-105334.rs → tests/rustdoc-ui/issues/issue-105334.rs b/tests/rustdoc-ui/issue-105334.rs → tests/rustdoc-ui/issues/issue-105334.rs
diff --git a/tests/rustdoc-ui/issue-105334.stderr → tests/rustdoc-ui/issues/issue-105334.stderr b/tests/rustdoc-ui/issue-105334.stderr → tests/rustdoc-ui/issues/issue-105334.stderr
diff --git a/tests/rustdoc-ui/issue-105737.rs → tests/rustdoc-ui/issues/issue-105737.rs b/tests/rustdoc-ui/issue-105737.rs → tests/rustdoc-ui/issues/issue-105737.rs
diff --git a/tests/rustdoc-ui/issue-105737.stderr → tests/rustdoc-ui/issues/issue-105737.stderr b/tests/rustdoc-ui/issue-105737.stderr → tests/rustdoc-ui/issues/issue-105737.stderr
diff --git a/tests/rustdoc-ui/issue-105742.rs → tests/rustdoc-ui/issues/issue-105742.rs b/tests/rustdoc-ui/issue-105742.rs → tests/rustdoc-ui/issues/issue-105742.rs
diff --git a/tests/rustdoc-ui/issue-105742.stderr → tests/rustdoc-ui/issues/issue-105742.stderr b/tests/rustdoc-ui/issue-105742.stderr → tests/rustdoc-ui/issues/issue-105742.stderr
diff --git a/tests/rustdoc-ui/issue-106213.rs → tests/rustdoc-ui/issues/issue-106213.rs b/tests/rustdoc-ui/issue-106213.rs → tests/rustdoc-ui/issues/issue-106213.rs
diff --git a/tests/rustdoc-ui/issue-106213.stderr → tests/rustdoc-ui/issues/issue-106213.stderr b/tests/rustdoc-ui/issue-106213.stderr → tests/rustdoc-ui/issues/issue-106213.stderr
diff --git a/tests/rustdoc-ui/issue-106226.rs → tests/rustdoc-ui/issues/issue-106226.rs b/tests/rustdoc-ui/issue-106226.rs → tests/rustdoc-ui/issues/issue-106226.rs
diff --git a/tests/rustdoc-ui/issue-106226.stderr → tests/rustdoc-ui/issues/issue-106226.stderr b/tests/rustdoc-ui/issue-106226.stderr → tests/rustdoc-ui/issues/issue-106226.stderr
diff --git a/tests/rustdoc-ui/issue-107918.rs → tests/rustdoc-ui/issues/issue-107918.rs b/tests/rustdoc-ui/issue-107918.rs → tests/rustdoc-ui/issues/issue-107918.rs
diff --git a/...oc-ui/issue-109282-import-inline-merge.rs → ...ssues/issue-109282-import-inline-merge.rs b/...oc-ui/issue-109282-import-inline-merge.rs → ...ssues/issue-109282-import-inline-merge.rs
diff --git a/tests/rustdoc-ui/issue-110900.rs → tests/rustdoc-ui/issues/issue-110900.rs b/tests/rustdoc-ui/issue-110900.rs → tests/rustdoc-ui/issues/issue-110900.rs
diff --git a/tests/rustdoc-ui/issue-58473-2.rs → tests/rustdoc-ui/issues/issue-58473-2.rs b/tests/rustdoc-ui/issue-58473-2.rs → tests/rustdoc-ui/issues/issue-58473-2.rs
diff --git a/tests/rustdoc-ui/issue-58473.rs → tests/rustdoc-ui/issues/issue-58473.rs b/tests/rustdoc-ui/issue-58473.rs → tests/rustdoc-ui/issues/issue-58473.rs
diff --git a/tests/rustdoc-ui/issue-61592-2.rs → tests/rustdoc-ui/issues/issue-61592-2.rs b/tests/rustdoc-ui/issue-61592-2.rs → tests/rustdoc-ui/issues/issue-61592-2.rs
diff --git a/tests/rustdoc-ui/issue-61592-2.stderr → tests/rustdoc-ui/issues/issue-61592-2.stderr b/tests/rustdoc-ui/issue-61592-2.stderr → tests/rustdoc-ui/issues/issue-61592-2.stderr
diff --git a/tests/rustdoc-ui/issue-61592.rs → tests/rustdoc-ui/issues/issue-61592.rs b/tests/rustdoc-ui/issue-61592.rs → tests/rustdoc-ui/issues/issue-61592.rs
diff --git a/tests/rustdoc-ui/issue-61592.stderr → tests/rustdoc-ui/issues/issue-61592.stderr b/tests/rustdoc-ui/issue-61592.stderr → tests/rustdoc-ui/issues/issue-61592.stderr
diff --git a/tests/rustdoc-ui/issue-61732.rs → tests/rustdoc-ui/issues/issue-61732.rs b/tests/rustdoc-ui/issue-61732.rs → tests/rustdoc-ui/issues/issue-61732.rs
diff --git a/tests/rustdoc-ui/issue-61732.stderr → tests/rustdoc-ui/issues/issue-61732.stderr b/tests/rustdoc-ui/issue-61732.stderr → tests/rustdoc-ui/issues/issue-61732.stderr
diff --git a/tests/rustdoc-ui/issue-74134.private.stderr → ...tdoc-ui/issues/issue-74134.private.stderr b/tests/rustdoc-ui/issue-74134.private.stderr → ...tdoc-ui/issues/issue-74134.private.stderr
diff --git a/tests/rustdoc-ui/issue-74134.public.stderr → ...stdoc-ui/issues/issue-74134.public.stderr b/tests/rustdoc-ui/issue-74134.public.stderr → ...stdoc-ui/issues/issue-74134.public.stderr
diff --git a/tests/rustdoc-ui/issue-74134.rs → tests/rustdoc-ui/issues/issue-74134.rs b/tests/rustdoc-ui/issue-74134.rs → tests/rustdoc-ui/issues/issue-74134.rs
diff --git a/tests/rustdoc-ui/issue-79465.rs → tests/rustdoc-ui/issues/issue-79465.rs b/tests/rustdoc-ui/issue-79465.rs → tests/rustdoc-ui/issues/issue-79465.rs
diff --git a/tests/rustdoc-ui/issue-79465.stderr → tests/rustdoc-ui/issues/issue-79465.stderr b/tests/rustdoc-ui/issue-79465.stderr → tests/rustdoc-ui/issues/issue-79465.stderr
diff --git a/tests/rustdoc-ui/issue-79467.rs → tests/rustdoc-ui/issues/issue-79467.rs b/tests/rustdoc-ui/issue-79467.rs → tests/rustdoc-ui/issues/issue-79467.rs
diff --git a/tests/rustdoc-ui/issue-79467.stderr → tests/rustdoc-ui/issues/issue-79467.stderr b/tests/rustdoc-ui/issue-79467.stderr → tests/rustdoc-ui/issues/issue-79467.stderr
diff --git a/tests/rustdoc-ui/issue-79494.rs → tests/rustdoc-ui/issues/issue-79494.rs b/tests/rustdoc-ui/issue-79494.rs → tests/rustdoc-ui/issues/issue-79494.rs
diff --git a/tests/rustdoc-ui/issue-79494.stderr → tests/rustdoc-ui/issues/issue-79494.stderr b/tests/rustdoc-ui/issue-79494.stderr → tests/rustdoc-ui/issues/issue-79494.stderr
diff --git a/tests/rustdoc-ui/issue-80992.rs → tests/rustdoc-ui/issues/issue-80992.rs b/tests/rustdoc-ui/issue-80992.rs → tests/rustdoc-ui/issues/issue-80992.rs
@@ -1,6 +1,6 @@
 // check-pass
 // compile-flags:--test
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 pub fn test() -> Result<(), ()> {

diff --git a/tests/rustdoc-ui/issue-80992.stdout → tests/rustdoc-ui/issues/issue-80992.stdout b/tests/rustdoc-ui/issue-80992.stdout → tests/rustdoc-ui/issues/issue-80992.stdout
diff --git a/tests/rustdoc-ui/issue-81662-shortness.rs → ...ustdoc-ui/issues/issue-81662-shortness.rs b/tests/rustdoc-ui/issue-81662-shortness.rs → ...ustdoc-ui/issues/issue-81662-shortness.rs
@@ -1,5 +1,5 @@
 // compile-flags:--test --error-format=short
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // failure-status: 101
 

diff --git a/...s/rustdoc-ui/issue-81662-shortness.stdout → ...oc-ui/issues/issue-81662-shortness.stdout b/...s/rustdoc-ui/issue-81662-shortness.stdout → ...oc-ui/issues/issue-81662-shortness.stdout
diff --git a/.../rustdoc-ui/issue-83883-describe-lints.rs → ...c-ui/issues/issue-83883-describe-lints.rs b/.../rustdoc-ui/issue-83883-describe-lints.rs → ...c-ui/issues/issue-83883-describe-lints.rs
diff --git a/...tdoc-ui/issue-83883-describe-lints.stdout → .../issues/issue-83883-describe-lints.stdout b/...tdoc-ui/issue-83883-describe-lints.stdout → .../issues/issue-83883-describe-lints.stdout
diff --git a/tests/rustdoc-ui/issue-91134.rs → tests/rustdoc-ui/issues/issue-91134.rs b/tests/rustdoc-ui/issue-91134.rs → tests/rustdoc-ui/issues/issue-91134.rs
@@ -1,7 +1,7 @@
 // compile-flags: --test --crate-name=empty_fn --extern=empty_fn --test-args=--test-threads=1
 // aux-build:empty-fn.rs
 // check-pass
-// normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
+// normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
 // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 // edition:2021
 

diff --git a/tests/rustdoc-ui/issue-91134.stdout → tests/rustdoc-ui/issues/issue-91134.stdout b/tests/rustdoc-ui/issue-91134.stdout → tests/rustdoc-ui/issues/issue-91134.stdout
diff --git a/tests/rustdoc-ui/issue-91713.rs → tests/rustdoc-ui/issues/issue-91713.rs b/tests/rustdoc-ui/issue-91713.rs → tests/rustdoc-ui/issues/issue-91713.rs
diff --git a/tests/rustdoc-ui/issue-91713.stderr → tests/rustdoc-ui/issues/issue-91713.stderr b/tests/rustdoc-ui/issue-91713.stderr → tests/rustdoc-ui/issues/issue-91713.stderr
diff --git a/tests/rustdoc-ui/issue-91713.stdout → tests/rustdoc-ui/issues/issue-91713.stdout b/tests/rustdoc-ui/issue-91713.stdout → tests/rustdoc-ui/issues/issue-91713.stdout
diff --git a/tests/rustdoc-ui/issue-96287.rs → tests/rustdoc-ui/issues/issue-96287.rs b/tests/rustdoc-ui/issue-96287.rs → tests/rustdoc-ui/issues/issue-96287.rs
diff --git a/tests/rustdoc-ui/issue-96287.stderr → tests/rustdoc-ui/issues/issue-96287.stderr b/tests/rustdoc-ui/issue-96287.stderr → tests/rustdoc-ui/issues/issue-96287.stderr
diff --git a/tests/rustdoc-ui/issue-98690.rs → tests/rustdoc-ui/issues/issue-98690.rs b/tests/rustdoc-ui/issue-98690.rs → tests/rustdoc-ui/issues/issue-98690.rs
diff --git a/tests/rustdoc-ui/issue-98690.stderr → tests/rustdoc-ui/issues/issue-98690.stderr b/tests/rustdoc-ui/issue-98690.stderr → tests/rustdoc-ui/issues/issue-98690.stderr
diff --git a/tests/rustdoc-ui/bare-urls.fixed → tests/rustdoc-ui/lints/bare-urls.fixed b/tests/rustdoc-ui/bare-urls.fixed → tests/rustdoc-ui/lints/bare-urls.fixed
diff --git a/tests/rustdoc-ui/bare-urls.rs → tests/rustdoc-ui/lints/bare-urls.rs b/tests/rustdoc-ui/bare-urls.rs → tests/rustdoc-ui/lints/bare-urls.rs
diff --git a/tests/rustdoc-ui/bare-urls.stderr → tests/rustdoc-ui/lints/bare-urls.stderr b/tests/rustdoc-ui/bare-urls.stderr → tests/rustdoc-ui/lints/bare-urls.stderr
diff --git a/tests/rustdoc-ui/check-attr.rs → tests/rustdoc-ui/lints/check-attr.rs b/tests/rustdoc-ui/check-attr.rs → tests/rustdoc-ui/lints/check-attr.rs
diff --git a/tests/rustdoc-ui/check-attr.stderr → tests/rustdoc-ui/lints/check-attr.stderr b/tests/rustdoc-ui/check-attr.stderr → tests/rustdoc-ui/lints/check-attr.stderr
diff --git a/tests/rustdoc-ui/check-fail.rs → tests/rustdoc-ui/lints/check-fail.rs b/tests/rustdoc-ui/check-fail.rs → tests/rustdoc-ui/lints/check-fail.rs
diff --git a/tests/rustdoc-ui/check-fail.stderr → tests/rustdoc-ui/lints/check-fail.stderr b/tests/rustdoc-ui/check-fail.stderr → tests/rustdoc-ui/lints/check-fail.stderr
diff --git a/tests/rustdoc-ui/check.rs → tests/rustdoc-ui/lints/check.rs b/tests/rustdoc-ui/check.rs → tests/rustdoc-ui/lints/check.rs
diff --git a/tests/rustdoc-ui/check.stderr → tests/rustdoc-ui/lints/check.stderr b/tests/rustdoc-ui/check.stderr → tests/rustdoc-ui/lints/check.stderr
diff --git a/tests/rustdoc-ui/deny-missing-docs-crate.rs → ...stdoc-ui/lints/deny-missing-docs-crate.rs b/tests/rustdoc-ui/deny-missing-docs-crate.rs → ...stdoc-ui/lints/deny-missing-docs-crate.rs
diff --git a/...rustdoc-ui/deny-missing-docs-crate.stderr → ...c-ui/lints/deny-missing-docs-crate.stderr b/...rustdoc-ui/deny-missing-docs-crate.stderr → ...c-ui/lints/deny-missing-docs-crate.stderr
diff --git a/tests/rustdoc-ui/deny-missing-docs-macro.rs → ...stdoc-ui/lints/deny-missing-docs-macro.rs b/tests/rustdoc-ui/deny-missing-docs-macro.rs → ...stdoc-ui/lints/deny-missing-docs-macro.rs
diff --git a/...rustdoc-ui/deny-missing-docs-macro.stderr → ...c-ui/lints/deny-missing-docs-macro.stderr b/...rustdoc-ui/deny-missing-docs-macro.stderr → ...c-ui/lints/deny-missing-docs-macro.stderr
diff --git a/tests/rustdoc-ui/doc-attr.rs → tests/rustdoc-ui/lints/doc-attr.rs b/tests/rustdoc-ui/doc-attr.rs → tests/rustdoc-ui/lints/doc-attr.rs
diff --git a/tests/rustdoc-ui/doc-attr.stderr → tests/rustdoc-ui/lints/doc-attr.stderr b/tests/rustdoc-ui/doc-attr.stderr → tests/rustdoc-ui/lints/doc-attr.stderr
diff --git a/tests/rustdoc-ui/doc-spotlight.fixed → tests/rustdoc-ui/lints/doc-spotlight.fixed b/tests/rustdoc-ui/doc-spotlight.fixed → tests/rustdoc-ui/lints/doc-spotlight.fixed
diff --git a/tests/rustdoc-ui/doc-spotlight.rs → tests/rustdoc-ui/lints/doc-spotlight.rs b/tests/rustdoc-ui/doc-spotlight.rs → tests/rustdoc-ui/lints/doc-spotlight.rs
diff --git a/tests/rustdoc-ui/doc-spotlight.stderr → tests/rustdoc-ui/lints/doc-spotlight.stderr b/tests/rustdoc-ui/doc-spotlight.stderr → tests/rustdoc-ui/lints/doc-spotlight.stderr
diff --git a/tests/rustdoc-ui/doc-without-codeblock.rs → ...rustdoc-ui/lints/doc-without-codeblock.rs b/tests/rustdoc-ui/doc-without-codeblock.rs → ...rustdoc-ui/lints/doc-without-codeblock.rs
diff --git a/...s/rustdoc-ui/doc-without-codeblock.stderr → ...doc-ui/lints/doc-without-codeblock.stderr b/...s/rustdoc-ui/doc-without-codeblock.stderr → ...doc-ui/lints/doc-without-codeblock.stderr
diff --git a/tests/rustdoc-ui/doc_cfg_hide.rs → tests/rustdoc-ui/lints/doc_cfg_hide.rs b/tests/rustdoc-ui/doc_cfg_hide.rs → tests/rustdoc-ui/lints/doc_cfg_hide.rs
diff --git a/tests/rustdoc-ui/doc_cfg_hide.stderr → tests/rustdoc-ui/lints/doc_cfg_hide.stderr b/tests/rustdoc-ui/doc_cfg_hide.stderr → tests/rustdoc-ui/lints/doc_cfg_hide.stderr
diff --git a/...s/rustdoc-ui/expect-tool-lint-rfc-2383.rs → ...doc-ui/lints/expect-tool-lint-rfc-2383.rs b/...s/rustdoc-ui/expect-tool-lint-rfc-2383.rs → ...doc-ui/lints/expect-tool-lint-rfc-2383.rs
diff --git a/...stdoc-ui/expect-tool-lint-rfc-2383.stderr → ...ui/lints/expect-tool-lint-rfc-2383.stderr b/...stdoc-ui/expect-tool-lint-rfc-2383.stderr → ...ui/lints/expect-tool-lint-rfc-2383.stderr
diff --git a/...gate-rustdoc_missing_doc_code_examples.rs → ...gate-rustdoc_missing_doc_code_examples.rs b/...gate-rustdoc_missing_doc_code_examples.rs → ...gate-rustdoc_missing_doc_code_examples.rs
diff --git a/...-rustdoc_missing_doc_code_examples.stderr → ...-rustdoc_missing_doc_code_examples.stderr b/...-rustdoc_missing_doc_code_examples.stderr → ...-rustdoc_missing_doc_code_examples.stderr
diff --git a/tests/rustdoc-ui/invalid-doc-attr.rs → tests/rustdoc-ui/lints/invalid-doc-attr.rs b/tests/rustdoc-ui/invalid-doc-attr.rs → tests/rustdoc-ui/lints/invalid-doc-attr.rs
diff --git a/tests/rustdoc-ui/invalid-doc-attr.stderr → .../rustdoc-ui/lints/invalid-doc-attr.stderr b/tests/rustdoc-ui/invalid-doc-attr.stderr → .../rustdoc-ui/lints/invalid-doc-attr.stderr
diff --git a/...stdoc-ui/invalid-html-self-closing-tag.rs → ...ui/lints/invalid-html-self-closing-tag.rs b/...stdoc-ui/invalid-html-self-closing-tag.rs → ...ui/lints/invalid-html-self-closing-tag.rs
diff --git a/...c-ui/invalid-html-self-closing-tag.stderr → ...ints/invalid-html-self-closing-tag.stderr b/...c-ui/invalid-html-self-closing-tag.stderr → ...ints/invalid-html-self-closing-tag.stderr
diff --git a/tests/rustdoc-ui/invalid-html-tags.rs → tests/rustdoc-ui/lints/invalid-html-tags.rs b/tests/rustdoc-ui/invalid-html-tags.rs → tests/rustdoc-ui/lints/invalid-html-tags.rs
diff --git a/tests/rustdoc-ui/invalid-html-tags.stderr → ...rustdoc-ui/lints/invalid-html-tags.stderr b/tests/rustdoc-ui/invalid-html-tags.stderr → ...rustdoc-ui/lints/invalid-html-tags.stderr
diff --git a/tests/rustdoc-ui/lint-group.rs → tests/rustdoc-ui/lints/lint-group.rs b/tests/rustdoc-ui/lint-group.rs → tests/rustdoc-ui/lints/lint-group.rs
diff --git a/tests/rustdoc-ui/lint-group.stderr → tests/rustdoc-ui/lints/lint-group.stderr b/tests/rustdoc-ui/lint-group.stderr → tests/rustdoc-ui/lints/lint-group.stderr
diff --git a/...stdoc-ui/lint-missing-doc-code-example.rs → ...ui/lints/lint-missing-doc-code-example.rs b/...stdoc-ui/lint-missing-doc-code-example.rs → ...ui/lints/lint-missing-doc-code-example.rs
diff --git a/...c-ui/lint-missing-doc-code-example.stderr → ...ints/lint-missing-doc-code-example.stderr b/...c-ui/lint-missing-doc-code-example.stderr → ...ints/lint-missing-doc-code-example.stderr
diff --git a/tests/rustdoc-ui/no-crate-level-doc-lint.rs → ...stdoc-ui/lints/no-crate-level-doc-lint.rs b/tests/rustdoc-ui/no-crate-level-doc-lint.rs → ...stdoc-ui/lints/no-crate-level-doc-lint.rs
diff --git a/...rustdoc-ui/no-crate-level-doc-lint.stderr → ...c-ui/lints/no-crate-level-doc-lint.stderr b/...rustdoc-ui/no-crate-level-doc-lint.stderr → ...c-ui/lints/no-crate-level-doc-lint.stderr
diff --git a/.../rustdoc-ui/renamed-lint-still-applies.rs → ...oc-ui/lints/renamed-lint-still-applies.rs b/.../rustdoc-ui/renamed-lint-still-applies.rs → ...oc-ui/lints/renamed-lint-still-applies.rs
diff --git a/...tdoc-ui/renamed-lint-still-applies.stderr → ...i/lints/renamed-lint-still-applies.stderr b/...tdoc-ui/renamed-lint-still-applies.stderr → ...i/lints/renamed-lint-still-applies.stderr
diff --git a/...stdoc-ui/rustdoc-all-only-stable-lints.rs → ...ui/lints/rustdoc-all-only-stable-lints.rs b/...stdoc-ui/rustdoc-all-only-stable-lints.rs → ...ui/lints/rustdoc-all-only-stable-lints.rs
diff --git a/tests/rustdoc-ui/unknown-renamed-lints.rs → ...rustdoc-ui/lints/unknown-renamed-lints.rs b/tests/rustdoc-ui/unknown-renamed-lints.rs → ...rustdoc-ui/lints/unknown-renamed-lints.rs
diff --git a/...s/rustdoc-ui/unknown-renamed-lints.stderr → ...doc-ui/lints/unknown-renamed-lints.stderr b/...s/rustdoc-ui/unknown-renamed-lints.stderr → ...doc-ui/lints/unknown-renamed-lints.stderr
diff --git a/tests/rustdoc-ui/unused-braces-lint.rs → tests/rustdoc-ui/lints/unused-braces-lint.rs b/tests/rustdoc-ui/unused-braces-lint.rs → tests/rustdoc-ui/lints/unused-braces-lint.rs
diff --git a/tests/rustdoc-ui/unused.rs → tests/rustdoc-ui/lints/unused.rs b/tests/rustdoc-ui/unused.rs → tests/rustdoc-ui/lints/unused.rs
diff --git a/...-ui/scrape-examples-fail-if-type-error.rs → ...les/scrape-examples-fail-if-type-error.rs b/...-ui/scrape-examples-fail-if-type-error.rs → ...les/scrape-examples-fail-if-type-error.rs
diff --git a/...scrape-examples-fail-if-type-error.stderr → ...scrape-examples-fail-if-type-error.stderr b/...scrape-examples-fail-if-type-error.stderr → ...scrape-examples-fail-if-type-error.stderr
diff --git a/tests/rustdoc-ui/scrape-examples-ice.rs → ...ui/scrape-examples/scrape-examples-ice.rs b/tests/rustdoc-ui/scrape-examples-ice.rs → ...ui/scrape-examples/scrape-examples-ice.rs
diff --git a/...doc-ui/scrape-examples-wrong-options-1.rs → ...amples/scrape-examples-wrong-options-1.rs b/...doc-ui/scrape-examples-wrong-options-1.rs → ...amples/scrape-examples-wrong-options-1.rs
diff --git a/...ui/scrape-examples-wrong-options-1.stderr → ...es/scrape-examples-wrong-options-1.stderr b/...ui/scrape-examples-wrong-options-1.stderr → ...es/scrape-examples-wrong-options-1.stderr
diff --git a/...doc-ui/scrape-examples-wrong-options-2.rs → ...amples/scrape-examples-wrong-options-2.rs b/...doc-ui/scrape-examples-wrong-options-2.rs → ...amples/scrape-examples-wrong-options-2.rs
diff --git a/...ui/scrape-examples-wrong-options-2.stderr → ...es/scrape-examples-wrong-options-2.stderr b/...ui/scrape-examples-wrong-options-2.stderr → ...es/scrape-examples-wrong-options-2.stderr