From 5fa975142f98939222e12e8ca1338185cc7feb1c Mon Sep 17 00:00:00 2001 From: jyn Date: Sat, 29 Apr 2023 04:08:33 -0500 Subject: [PATCH 1/2] Move some rustdoc-ui tests to subdirectories --- .../rustdoc-ui/{ => check-cfg}/check-cfg-test.stderr | 0 .../rustdoc-ui/{ => check-cfg}/check-cfg-unstable.rs | 0 .../{ => check-cfg}/check-cfg-unstable.stderr | 0 tests/rustdoc-ui/{ => check-cfg}/check-cfg.rs | 0 tests/rustdoc-ui/{ => check-cfg}/check-cfg.stderr | 0 .../{ => doctest}/auxiliary/extern_macros.rs | 0 tests/rustdoc-ui/{ => doctest}/block-doc-comment.rs | 0 .../rustdoc-ui/{ => doctest}/block-doc-comment.stdout | 0 tests/rustdoc-ui/{ => doctest}/cfg-test.rs | 2 +- tests/rustdoc-ui/{ => doctest}/cfg-test.stdout | 0 tests/rustdoc-ui/{ => doctest}/check-attr-test.rs | 0 tests/rustdoc-ui/{ => doctest}/check-attr-test.stderr | 0 tests/rustdoc-ui/{ => doctest}/check-cfg-test.rs | 4 ++-- tests/rustdoc-ui/doctest/check-cfg-test.stderr | 11 +++++++++++ tests/rustdoc-ui/{ => doctest}/check-cfg-test.stdout | 0 tests/rustdoc-ui/{ => doctest}/display-output.rs | 2 +- tests/rustdoc-ui/{ => doctest}/display-output.stdout | 0 .../{ => doctest}/doc-comment-multi-line-attr.rs | 2 +- .../{ => doctest}/doc-comment-multi-line-attr.stdout | 0 .../{ => doctest}/doc-comment-multi-line-cfg-attr.rs | 2 +- .../doc-comment-multi-line-cfg-attr.stdout | 0 tests/rustdoc-ui/{ => doctest}/doc-test-attr-pass.rs | 0 tests/rustdoc-ui/{ => doctest}/doc-test-attr.rs | 0 tests/rustdoc-ui/{ => doctest}/doc-test-attr.stderr | 0 .../{ => doctest}/doc-test-doctest-feature.rs | 2 +- .../{ => doctest}/doc-test-doctest-feature.stdout | 0 .../{ => doctest}/doc-test-rustdoc-feature.rs | 2 +- .../{ => doctest}/doc-test-rustdoc-feature.stdout | 0 tests/rustdoc-ui/{ => doctest}/doctest-edition.rs | 0 tests/rustdoc-ui/{ => doctest}/doctest-edition.stderr | 0 .../doctest-multiline-crate-attribute.rs | 2 +- .../doctest-multiline-crate-attribute.stdout | 0 tests/rustdoc-ui/{ => doctest}/doctest-output.rs | 2 +- tests/rustdoc-ui/{ => doctest}/doctest-output.stdout | 0 .../{ => doctest}/failed-doctest-compile-fail.rs | 2 +- .../{ => doctest}/failed-doctest-compile-fail.stdout | 0 .../failed-doctest-extra-semicolon-on-item.rs | 2 +- .../failed-doctest-extra-semicolon-on-item.stdout | 0 .../{ => doctest}/failed-doctest-missing-codes.rs | 2 +- .../{ => doctest}/failed-doctest-missing-codes.stdout | 0 .../{ => doctest}/failed-doctest-output-windows.rs | 2 +- .../failed-doctest-output-windows.stdout | 0 .../rustdoc-ui/{ => doctest}/failed-doctest-output.rs | 2 +- .../{ => doctest}/failed-doctest-output.stdout | 0 .../{ => doctest}/failed-doctest-should-panic.rs | 2 +- .../{ => doctest}/failed-doctest-should-panic.stdout | 0 tests/rustdoc-ui/{ => doctest}/no-run-flag-error.rs | 0 .../rustdoc-ui/{ => doctest}/no-run-flag-error.stderr | 0 tests/rustdoc-ui/{ => doctest}/no-run-flag.rs | 2 +- tests/rustdoc-ui/{ => doctest}/no-run-flag.stdout | 0 tests/rustdoc-ui/{ => doctest}/nocapture-fail.rs | 4 ++-- tests/rustdoc-ui/{ => doctest}/nocapture-fail.stderr | 0 tests/rustdoc-ui/{ => doctest}/nocapture-fail.stdout | 0 tests/rustdoc-ui/{ => doctest}/nocapture.rs | 2 +- tests/rustdoc-ui/{ => doctest}/nocapture.stderr | 0 tests/rustdoc-ui/{ => doctest}/nocapture.stdout | 0 tests/rustdoc-ui/{ => doctest}/private-doc-test.rs | 0 .../rustdoc-ui/{ => doctest}/private-item-doc-test.rs | 0 .../{ => doctest}/private-item-doc-test.stderr | 0 .../{ => doctest}/private-public-item-doc-test.rs | 0 .../{ => doctest}/private-public-item-doc-test.stderr | 0 .../{ => doctest}/public-reexported-item-doc-test.rs | 0 .../{ => doctest}/run-directory.correct.stdout | 0 .../{ => doctest}/run-directory.incorrect.stdout | 0 tests/rustdoc-ui/{ => doctest}/run-directory.rs | 6 +++--- tests/rustdoc-ui/{ => doctest}/test-compile-fail1.rs | 0 .../{ => doctest}/test-compile-fail1.stderr | 0 tests/rustdoc-ui/{ => doctest}/test-compile-fail2.rs | 0 .../{ => doctest}/test-compile-fail2.stderr | 0 tests/rustdoc-ui/{ => doctest}/test-compile-fail3.rs | 0 .../{ => doctest}/test-compile-fail3.stderr | 0 tests/rustdoc-ui/{ => doctest}/test-no_std.rs | 2 +- tests/rustdoc-ui/{ => doctest}/test-no_std.stdout | 0 tests/rustdoc-ui/{ => doctest}/test-type.rs | 2 +- tests/rustdoc-ui/{ => doctest}/test-type.stdout | 0 .../rustdoc-ui/{ => doctest}/unparseable-doc-test.rs | 2 +- .../{ => doctest}/unparseable-doc-test.stdout | 0 .../generate-link-to-definition-opt-unstable.rs | 0 .../generate-link-to-definition-opt-unstable.stderr | 0 .../generate-link-to-definition-opt.rs | 0 .../generate-link-to-definition-opt.stderr | 0 .../generate-link-to-definition-opt2.rs | 0 .../generate-link-to-definition-opt2.stderr | 0 .../deny-intra-link-resolution-failure.rs | 0 .../deny-intra-link-resolution-failure.stderr | 0 tests/rustdoc-ui/{ => issues}/auxiliary/empty-fn.rs | 0 .../rustdoc-ui/{ => issues}/auxiliary/issue-61592.rs | 0 .../{ => issues}/auxiliary/panic-handler.rs | 0 tests/rustdoc-ui/{ => issues}/issue-101076.rs | 0 tests/rustdoc-ui/{ => issues}/issue-102986.rs | 0 tests/rustdoc-ui/{ => issues}/issue-102986.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-103997.rs | 0 tests/rustdoc-ui/{ => issues}/issue-103997.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-105334.rs | 0 tests/rustdoc-ui/{ => issues}/issue-105334.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-105737.rs | 0 tests/rustdoc-ui/{ => issues}/issue-105737.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-105742.rs | 0 tests/rustdoc-ui/{ => issues}/issue-105742.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-106213.rs | 0 tests/rustdoc-ui/{ => issues}/issue-106213.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-106226.rs | 0 tests/rustdoc-ui/{ => issues}/issue-106226.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-107918.rs | 0 .../{ => issues}/issue-109282-import-inline-merge.rs | 0 tests/rustdoc-ui/{ => issues}/issue-110900.rs | 0 tests/rustdoc-ui/{ => issues}/issue-58473-2.rs | 0 tests/rustdoc-ui/{ => issues}/issue-58473.rs | 0 tests/rustdoc-ui/{ => issues}/issue-61592-2.rs | 0 tests/rustdoc-ui/{ => issues}/issue-61592-2.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-61592.rs | 0 tests/rustdoc-ui/{ => issues}/issue-61592.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-61732.rs | 0 tests/rustdoc-ui/{ => issues}/issue-61732.stderr | 0 .../{ => issues}/issue-74134.private.stderr | 0 .../rustdoc-ui/{ => issues}/issue-74134.public.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-74134.rs | 0 tests/rustdoc-ui/{ => issues}/issue-79465.rs | 0 tests/rustdoc-ui/{ => issues}/issue-79465.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-79467.rs | 0 tests/rustdoc-ui/{ => issues}/issue-79467.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-79494.rs | 0 tests/rustdoc-ui/{ => issues}/issue-79494.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-80992.rs | 2 +- tests/rustdoc-ui/{ => issues}/issue-80992.stdout | 0 .../rustdoc-ui/{ => issues}/issue-81662-shortness.rs | 2 +- .../{ => issues}/issue-81662-shortness.stdout | 0 .../{ => issues}/issue-83883-describe-lints.rs | 0 .../{ => issues}/issue-83883-describe-lints.stdout | 0 tests/rustdoc-ui/{ => issues}/issue-91134.rs | 2 +- tests/rustdoc-ui/{ => issues}/issue-91134.stdout | 0 tests/rustdoc-ui/{ => issues}/issue-91713.rs | 0 tests/rustdoc-ui/{ => issues}/issue-91713.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-91713.stdout | 0 tests/rustdoc-ui/{ => issues}/issue-96287.rs | 0 tests/rustdoc-ui/{ => issues}/issue-96287.stderr | 0 tests/rustdoc-ui/{ => issues}/issue-98690.rs | 0 tests/rustdoc-ui/{ => issues}/issue-98690.stderr | 0 .../scrape-examples-fail-if-type-error.rs | 0 .../scrape-examples-fail-if-type-error.stderr | 0 .../{ => scrape-examples}/scrape-examples-ice.rs | 0 .../scrape-examples-wrong-options-1.rs | 0 .../scrape-examples-wrong-options-1.stderr | 0 .../scrape-examples-wrong-options-2.rs | 0 .../scrape-examples-wrong-options-2.stderr | 0 145 files changed, 40 insertions(+), 29 deletions(-) rename tests/rustdoc-ui/{ => check-cfg}/check-cfg-test.stderr (100%) rename tests/rustdoc-ui/{ => check-cfg}/check-cfg-unstable.rs (100%) rename tests/rustdoc-ui/{ => check-cfg}/check-cfg-unstable.stderr (100%) rename tests/rustdoc-ui/{ => check-cfg}/check-cfg.rs (100%) rename tests/rustdoc-ui/{ => check-cfg}/check-cfg.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/auxiliary/extern_macros.rs (100%) rename tests/rustdoc-ui/{ => doctest}/block-doc-comment.rs (100%) rename tests/rustdoc-ui/{ => doctest}/block-doc-comment.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/cfg-test.rs (90%) rename tests/rustdoc-ui/{ => doctest}/cfg-test.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/check-attr-test.rs (100%) rename tests/rustdoc-ui/{ => doctest}/check-attr-test.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/check-cfg-test.rs (72%) create mode 100644 tests/rustdoc-ui/doctest/check-cfg-test.stderr rename tests/rustdoc-ui/{ => doctest}/check-cfg-test.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/display-output.rs (84%) rename tests/rustdoc-ui/{ => doctest}/display-output.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doc-comment-multi-line-attr.rs (80%) rename tests/rustdoc-ui/{ => doctest}/doc-comment-multi-line-attr.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doc-comment-multi-line-cfg-attr.rs (78%) rename tests/rustdoc-ui/{ => doctest}/doc-comment-multi-line-cfg-attr.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doc-test-attr-pass.rs (100%) rename tests/rustdoc-ui/{ => doctest}/doc-test-attr.rs (100%) rename tests/rustdoc-ui/{ => doctest}/doc-test-attr.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/doc-test-doctest-feature.rs (81%) rename tests/rustdoc-ui/{ => doctest}/doc-test-doctest-feature.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doc-test-rustdoc-feature.rs (82%) rename tests/rustdoc-ui/{ => doctest}/doc-test-rustdoc-feature.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doctest-edition.rs (100%) rename tests/rustdoc-ui/{ => doctest}/doctest-edition.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/doctest-multiline-crate-attribute.rs (81%) rename tests/rustdoc-ui/{ => doctest}/doctest-multiline-crate-attribute.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/doctest-output.rs (87%) rename tests/rustdoc-ui/{ => doctest}/doctest-output.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-compile-fail.rs (84%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-compile-fail.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-extra-semicolon-on-item.rs (88%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-extra-semicolon-on-item.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-missing-codes.rs (84%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-missing-codes.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-output-windows.rs (92%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-output-windows.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-output.rs (92%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-output.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-should-panic.rs (84%) rename tests/rustdoc-ui/{ => doctest}/failed-doctest-should-panic.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/no-run-flag-error.rs (100%) rename tests/rustdoc-ui/{ => doctest}/no-run-flag-error.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/no-run-flag.rs (91%) rename tests/rustdoc-ui/{ => doctest}/no-run-flag.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/nocapture-fail.rs (63%) rename tests/rustdoc-ui/{ => doctest}/nocapture-fail.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/nocapture-fail.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/nocapture.rs (77%) rename tests/rustdoc-ui/{ => doctest}/nocapture.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/nocapture.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/private-doc-test.rs (100%) rename tests/rustdoc-ui/{ => doctest}/private-item-doc-test.rs (100%) rename tests/rustdoc-ui/{ => doctest}/private-item-doc-test.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/private-public-item-doc-test.rs (100%) rename tests/rustdoc-ui/{ => doctest}/private-public-item-doc-test.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/public-reexported-item-doc-test.rs (100%) rename tests/rustdoc-ui/{ => doctest}/run-directory.correct.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/run-directory.incorrect.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/run-directory.rs (70%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail1.rs (100%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail1.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail2.rs (100%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail2.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail3.rs (100%) rename tests/rustdoc-ui/{ => doctest}/test-compile-fail3.stderr (100%) rename tests/rustdoc-ui/{ => doctest}/test-no_std.rs (75%) rename tests/rustdoc-ui/{ => doctest}/test-no_std.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/test-type.rs (87%) rename tests/rustdoc-ui/{ => doctest}/test-type.stdout (100%) rename tests/rustdoc-ui/{ => doctest}/unparseable-doc-test.rs (77%) rename tests/rustdoc-ui/{ => doctest}/unparseable-doc-test.stdout (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt-unstable.rs (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt-unstable.stderr (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt.rs (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt.stderr (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt2.rs (100%) rename tests/rustdoc-ui/{ => generate-link-to-definition}/generate-link-to-definition-opt2.stderr (100%) rename tests/rustdoc-ui/{ => intra-doc}/deny-intra-link-resolution-failure.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/deny-intra-link-resolution-failure.stderr (100%) rename tests/rustdoc-ui/{ => issues}/auxiliary/empty-fn.rs (100%) rename tests/rustdoc-ui/{ => issues}/auxiliary/issue-61592.rs (100%) rename tests/rustdoc-ui/{ => issues}/auxiliary/panic-handler.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-101076.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-102986.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-102986.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-103997.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-103997.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-105334.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-105334.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-105737.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-105737.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-105742.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-105742.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-106213.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-106213.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-106226.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-106226.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-107918.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-109282-import-inline-merge.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-110900.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-58473-2.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-58473.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-61592-2.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-61592-2.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-61592.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-61592.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-61732.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-61732.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-74134.private.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-74134.public.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-74134.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-79465.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-79465.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-79467.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-79467.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-79494.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-79494.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-80992.rs (78%) rename tests/rustdoc-ui/{ => issues}/issue-80992.stdout (100%) rename tests/rustdoc-ui/{ => issues}/issue-81662-shortness.rs (81%) rename tests/rustdoc-ui/{ => issues}/issue-81662-shortness.stdout (100%) rename tests/rustdoc-ui/{ => issues}/issue-83883-describe-lints.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-83883-describe-lints.stdout (100%) rename tests/rustdoc-ui/{ => issues}/issue-91134.rs (85%) rename tests/rustdoc-ui/{ => issues}/issue-91134.stdout (100%) rename tests/rustdoc-ui/{ => issues}/issue-91713.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-91713.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-91713.stdout (100%) rename tests/rustdoc-ui/{ => issues}/issue-96287.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-96287.stderr (100%) rename tests/rustdoc-ui/{ => issues}/issue-98690.rs (100%) rename tests/rustdoc-ui/{ => issues}/issue-98690.stderr (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-fail-if-type-error.rs (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-fail-if-type-error.stderr (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-ice.rs (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-wrong-options-1.rs (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-wrong-options-1.stderr (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-wrong-options-2.rs (100%) rename tests/rustdoc-ui/{ => scrape-examples}/scrape-examples-wrong-options-2.stderr (100%) diff --git a/tests/rustdoc-ui/check-cfg-test.stderr b/tests/rustdoc-ui/check-cfg/check-cfg-test.stderr similarity index 100% rename from tests/rustdoc-ui/check-cfg-test.stderr rename to tests/rustdoc-ui/check-cfg/check-cfg-test.stderr diff --git a/tests/rustdoc-ui/check-cfg-unstable.rs b/tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs similarity index 100% rename from tests/rustdoc-ui/check-cfg-unstable.rs rename to tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs diff --git a/tests/rustdoc-ui/check-cfg-unstable.stderr b/tests/rustdoc-ui/check-cfg/check-cfg-unstable.stderr similarity index 100% rename from tests/rustdoc-ui/check-cfg-unstable.stderr rename to tests/rustdoc-ui/check-cfg/check-cfg-unstable.stderr diff --git a/tests/rustdoc-ui/check-cfg.rs b/tests/rustdoc-ui/check-cfg/check-cfg.rs similarity index 100% rename from tests/rustdoc-ui/check-cfg.rs rename to tests/rustdoc-ui/check-cfg/check-cfg.rs diff --git a/tests/rustdoc-ui/check-cfg.stderr b/tests/rustdoc-ui/check-cfg/check-cfg.stderr similarity index 100% rename from tests/rustdoc-ui/check-cfg.stderr rename to tests/rustdoc-ui/check-cfg/check-cfg.stderr diff --git a/tests/rustdoc-ui/auxiliary/extern_macros.rs b/tests/rustdoc-ui/doctest/auxiliary/extern_macros.rs similarity index 100% rename from tests/rustdoc-ui/auxiliary/extern_macros.rs rename to tests/rustdoc-ui/doctest/auxiliary/extern_macros.rs diff --git a/tests/rustdoc-ui/block-doc-comment.rs b/tests/rustdoc-ui/doctest/block-doc-comment.rs similarity index 100% rename from tests/rustdoc-ui/block-doc-comment.rs rename to tests/rustdoc-ui/doctest/block-doc-comment.rs diff --git a/tests/rustdoc-ui/block-doc-comment.stdout b/tests/rustdoc-ui/doctest/block-doc-comment.stdout similarity index 100% rename from tests/rustdoc-ui/block-doc-comment.stdout rename to tests/rustdoc-ui/doctest/block-doc-comment.stdout diff --git a/tests/rustdoc-ui/cfg-test.rs b/tests/rustdoc-ui/doctest/cfg-test.rs similarity index 90% rename from tests/rustdoc-ui/cfg-test.rs rename to tests/rustdoc-ui/doctest/cfg-test.rs index d40b928373555..a263baa9738c5 100644 --- a/tests/rustdoc-ui/cfg-test.rs +++ b/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 b/tests/rustdoc-ui/doctest/cfg-test.stdout similarity index 100% rename from tests/rustdoc-ui/cfg-test.stdout rename to tests/rustdoc-ui/doctest/cfg-test.stdout diff --git a/tests/rustdoc-ui/check-attr-test.rs b/tests/rustdoc-ui/doctest/check-attr-test.rs similarity index 100% rename from tests/rustdoc-ui/check-attr-test.rs rename to tests/rustdoc-ui/doctest/check-attr-test.rs diff --git a/tests/rustdoc-ui/check-attr-test.stderr b/tests/rustdoc-ui/doctest/check-attr-test.stderr similarity index 100% rename from tests/rustdoc-ui/check-attr-test.stderr rename to tests/rustdoc-ui/doctest/check-attr-test.stderr diff --git a/tests/rustdoc-ui/check-cfg-test.rs b/tests/rustdoc-ui/doctest/check-cfg-test.rs similarity index 72% rename from tests/rustdoc-ui/check-cfg-test.rs rename to tests/rustdoc-ui/doctest/check-cfg-test.rs index 920432276cba0..49a801c3fb352 100644 --- a/tests/rustdoc-ui/check-cfg-test.rs +++ b/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 new file mode 100644 index 0000000000000..9770be2f191f0 --- /dev/null +++ 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 b/tests/rustdoc-ui/doctest/check-cfg-test.stdout similarity index 100% rename from tests/rustdoc-ui/check-cfg-test.stdout rename to tests/rustdoc-ui/doctest/check-cfg-test.stdout diff --git a/tests/rustdoc-ui/display-output.rs b/tests/rustdoc-ui/doctest/display-output.rs similarity index 84% rename from tests/rustdoc-ui/display-output.rs rename to tests/rustdoc-ui/doctest/display-output.rs index 23bc54e3cde1a..7a26dbff98613 100644 --- a/tests/rustdoc-ui/display-output.rs +++ b/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 b/tests/rustdoc-ui/doctest/display-output.stdout similarity index 100% rename from tests/rustdoc-ui/display-output.stdout rename to tests/rustdoc-ui/doctest/display-output.stdout diff --git a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs b/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.rs similarity index 80% rename from tests/rustdoc-ui/doc-comment-multi-line-attr.rs rename to tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.rs index db674e229fc0d..75508f435b3ca 100644 --- a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/doc-comment-multi-line-attr.stdout b/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout similarity index 100% rename from tests/rustdoc-ui/doc-comment-multi-line-attr.stdout rename to tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout diff --git a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs b/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.rs similarity index 78% rename from tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs rename to tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.rs index 6ce3cb9fc0707..3b0b27edb7d08 100644 --- a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs +++ b/tests/rustdoc-ui/doctest/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/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout b/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout similarity index 100% rename from tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.stdout rename to tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout diff --git a/tests/rustdoc-ui/doc-test-attr-pass.rs b/tests/rustdoc-ui/doctest/doc-test-attr-pass.rs similarity index 100% rename from tests/rustdoc-ui/doc-test-attr-pass.rs rename to tests/rustdoc-ui/doctest/doc-test-attr-pass.rs diff --git a/tests/rustdoc-ui/doc-test-attr.rs b/tests/rustdoc-ui/doctest/doc-test-attr.rs similarity index 100% rename from tests/rustdoc-ui/doc-test-attr.rs rename to tests/rustdoc-ui/doctest/doc-test-attr.rs diff --git a/tests/rustdoc-ui/doc-test-attr.stderr b/tests/rustdoc-ui/doctest/doc-test-attr.stderr similarity index 100% rename from tests/rustdoc-ui/doc-test-attr.stderr rename to tests/rustdoc-ui/doctest/doc-test-attr.stderr diff --git a/tests/rustdoc-ui/doc-test-doctest-feature.rs b/tests/rustdoc-ui/doctest/doc-test-doctest-feature.rs similarity index 81% rename from tests/rustdoc-ui/doc-test-doctest-feature.rs rename to tests/rustdoc-ui/doctest/doc-test-doctest-feature.rs index 88cf44e643be0..9c1f4936eab31 100644 --- a/tests/rustdoc-ui/doc-test-doctest-feature.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/doc-test-doctest-feature.stdout b/tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout similarity index 100% rename from tests/rustdoc-ui/doc-test-doctest-feature.stdout rename to tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout diff --git a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs b/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.rs similarity index 82% rename from tests/rustdoc-ui/doc-test-rustdoc-feature.rs rename to tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.rs index dc72a4857645e..1f90d13af84fc 100644 --- a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/doc-test-rustdoc-feature.stdout b/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout similarity index 100% rename from tests/rustdoc-ui/doc-test-rustdoc-feature.stdout rename to tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout diff --git a/tests/rustdoc-ui/doctest-edition.rs b/tests/rustdoc-ui/doctest/doctest-edition.rs similarity index 100% rename from tests/rustdoc-ui/doctest-edition.rs rename to tests/rustdoc-ui/doctest/doctest-edition.rs diff --git a/tests/rustdoc-ui/doctest-edition.stderr b/tests/rustdoc-ui/doctest/doctest-edition.stderr similarity index 100% rename from tests/rustdoc-ui/doctest-edition.stderr rename to tests/rustdoc-ui/doctest/doctest-edition.stderr diff --git a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs b/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.rs similarity index 81% rename from tests/rustdoc-ui/doctest-multiline-crate-attribute.rs rename to tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.rs index 260f5a7a64f50..a3bde6cb94103 100644 --- a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs +++ b/tests/rustdoc-ui/doctest/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/tests/rustdoc-ui/doctest-multiline-crate-attribute.stdout b/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout similarity index 100% rename from tests/rustdoc-ui/doctest-multiline-crate-attribute.stdout rename to tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout diff --git a/tests/rustdoc-ui/doctest-output.rs b/tests/rustdoc-ui/doctest/doctest-output.rs similarity index 87% rename from tests/rustdoc-ui/doctest-output.rs rename to tests/rustdoc-ui/doctest/doctest-output.rs index 303f768969817..26754b73f0bc0 100644 --- a/tests/rustdoc-ui/doctest-output.rs +++ b/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 b/tests/rustdoc-ui/doctest/doctest-output.stdout similarity index 100% rename from tests/rustdoc-ui/doctest-output.stdout rename to tests/rustdoc-ui/doctest/doctest-output.stdout diff --git a/tests/rustdoc-ui/failed-doctest-compile-fail.rs b/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.rs similarity index 84% rename from tests/rustdoc-ui/failed-doctest-compile-fail.rs rename to tests/rustdoc-ui/doctest/failed-doctest-compile-fail.rs index 4dfca600f1627..53b3857dfde69 100644 --- a/tests/rustdoc-ui/failed-doctest-compile-fail.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/failed-doctest-compile-fail.stdout b/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-compile-fail.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout diff --git a/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs b/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.rs similarity index 88% rename from tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs rename to tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.rs index 03a5b9d5d842f..84e4d61603aef 100644 --- a/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs +++ b/tests/rustdoc-ui/doctest/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/tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout b/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-extra-semicolon-on-item.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout diff --git a/tests/rustdoc-ui/failed-doctest-missing-codes.rs b/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.rs similarity index 84% rename from tests/rustdoc-ui/failed-doctest-missing-codes.rs rename to tests/rustdoc-ui/doctest/failed-doctest-missing-codes.rs index 66a229a0c7576..4e3b848fc02bc 100644 --- a/tests/rustdoc-ui/failed-doctest-missing-codes.rs +++ b/tests/rustdoc-ui/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/tests/rustdoc-ui/failed-doctest-missing-codes.stdout b/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-missing-codes.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout diff --git a/tests/rustdoc-ui/failed-doctest-output-windows.rs b/tests/rustdoc-ui/doctest/failed-doctest-output-windows.rs similarity index 92% rename from tests/rustdoc-ui/failed-doctest-output-windows.rs rename to tests/rustdoc-ui/doctest/failed-doctest-output-windows.rs index 456a9e68f20c1..6bc6c33c76ecc 100644 --- a/tests/rustdoc-ui/failed-doctest-output-windows.rs +++ b/tests/rustdoc-ui/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/tests/rustdoc-ui/failed-doctest-output-windows.stdout b/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-output-windows.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout diff --git a/tests/rustdoc-ui/failed-doctest-output.rs b/tests/rustdoc-ui/doctest/failed-doctest-output.rs similarity index 92% rename from tests/rustdoc-ui/failed-doctest-output.rs rename to tests/rustdoc-ui/doctest/failed-doctest-output.rs index 77647f8eca954..3e1312382ee87 100644 --- a/tests/rustdoc-ui/failed-doctest-output.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/failed-doctest-output.stdout b/tests/rustdoc-ui/doctest/failed-doctest-output.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-output.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-output.stdout diff --git a/tests/rustdoc-ui/failed-doctest-should-panic.rs b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.rs similarity index 84% rename from tests/rustdoc-ui/failed-doctest-should-panic.rs rename to tests/rustdoc-ui/doctest/failed-doctest-should-panic.rs index c134f80064d55..36284e814f3c4 100644 --- a/tests/rustdoc-ui/failed-doctest-should-panic.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/failed-doctest-should-panic.stdout b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout similarity index 100% rename from tests/rustdoc-ui/failed-doctest-should-panic.stdout rename to tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout diff --git a/tests/rustdoc-ui/no-run-flag-error.rs b/tests/rustdoc-ui/doctest/no-run-flag-error.rs similarity index 100% rename from tests/rustdoc-ui/no-run-flag-error.rs rename to tests/rustdoc-ui/doctest/no-run-flag-error.rs diff --git a/tests/rustdoc-ui/no-run-flag-error.stderr b/tests/rustdoc-ui/doctest/no-run-flag-error.stderr similarity index 100% rename from tests/rustdoc-ui/no-run-flag-error.stderr rename to tests/rustdoc-ui/doctest/no-run-flag-error.stderr diff --git a/tests/rustdoc-ui/no-run-flag.rs b/tests/rustdoc-ui/doctest/no-run-flag.rs similarity index 91% rename from tests/rustdoc-ui/no-run-flag.rs rename to tests/rustdoc-ui/doctest/no-run-flag.rs index 181730eb41618..1cf3b7c4bb3d0 100644 --- a/tests/rustdoc-ui/no-run-flag.rs +++ b/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 b/tests/rustdoc-ui/doctest/no-run-flag.stdout similarity index 100% rename from tests/rustdoc-ui/no-run-flag.stdout rename to tests/rustdoc-ui/doctest/no-run-flag.stdout diff --git a/tests/rustdoc-ui/nocapture-fail.rs b/tests/rustdoc-ui/doctest/nocapture-fail.rs similarity index 63% rename from tests/rustdoc-ui/nocapture-fail.rs rename to tests/rustdoc-ui/doctest/nocapture-fail.rs index 9a3fb592c6304..ce487a43db418 100644 --- a/tests/rustdoc-ui/nocapture-fail.rs +++ b/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 b/tests/rustdoc-ui/doctest/nocapture-fail.stderr similarity index 100% rename from tests/rustdoc-ui/nocapture-fail.stderr rename to tests/rustdoc-ui/doctest/nocapture-fail.stderr diff --git a/tests/rustdoc-ui/nocapture-fail.stdout b/tests/rustdoc-ui/doctest/nocapture-fail.stdout similarity index 100% rename from tests/rustdoc-ui/nocapture-fail.stdout rename to tests/rustdoc-ui/doctest/nocapture-fail.stdout diff --git a/tests/rustdoc-ui/nocapture.rs b/tests/rustdoc-ui/doctest/nocapture.rs similarity index 77% rename from tests/rustdoc-ui/nocapture.rs rename to tests/rustdoc-ui/doctest/nocapture.rs index 3eb38f2fb3b8b..25fbcf857e256 100644 --- a/tests/rustdoc-ui/nocapture.rs +++ b/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 b/tests/rustdoc-ui/doctest/nocapture.stderr similarity index 100% rename from tests/rustdoc-ui/nocapture.stderr rename to tests/rustdoc-ui/doctest/nocapture.stderr diff --git a/tests/rustdoc-ui/nocapture.stdout b/tests/rustdoc-ui/doctest/nocapture.stdout similarity index 100% rename from tests/rustdoc-ui/nocapture.stdout rename to tests/rustdoc-ui/doctest/nocapture.stdout diff --git a/tests/rustdoc-ui/private-doc-test.rs b/tests/rustdoc-ui/doctest/private-doc-test.rs similarity index 100% rename from tests/rustdoc-ui/private-doc-test.rs rename to tests/rustdoc-ui/doctest/private-doc-test.rs diff --git a/tests/rustdoc-ui/private-item-doc-test.rs b/tests/rustdoc-ui/doctest/private-item-doc-test.rs similarity index 100% rename from tests/rustdoc-ui/private-item-doc-test.rs rename to tests/rustdoc-ui/doctest/private-item-doc-test.rs diff --git a/tests/rustdoc-ui/private-item-doc-test.stderr b/tests/rustdoc-ui/doctest/private-item-doc-test.stderr similarity index 100% rename from tests/rustdoc-ui/private-item-doc-test.stderr rename to tests/rustdoc-ui/doctest/private-item-doc-test.stderr diff --git a/tests/rustdoc-ui/private-public-item-doc-test.rs b/tests/rustdoc-ui/doctest/private-public-item-doc-test.rs similarity index 100% rename from tests/rustdoc-ui/private-public-item-doc-test.rs rename to tests/rustdoc-ui/doctest/private-public-item-doc-test.rs diff --git a/tests/rustdoc-ui/private-public-item-doc-test.stderr b/tests/rustdoc-ui/doctest/private-public-item-doc-test.stderr similarity index 100% rename from tests/rustdoc-ui/private-public-item-doc-test.stderr rename to tests/rustdoc-ui/doctest/private-public-item-doc-test.stderr diff --git a/tests/rustdoc-ui/public-reexported-item-doc-test.rs b/tests/rustdoc-ui/doctest/public-reexported-item-doc-test.rs similarity index 100% rename from tests/rustdoc-ui/public-reexported-item-doc-test.rs rename to tests/rustdoc-ui/doctest/public-reexported-item-doc-test.rs diff --git a/tests/rustdoc-ui/run-directory.correct.stdout b/tests/rustdoc-ui/doctest/run-directory.correct.stdout similarity index 100% rename from tests/rustdoc-ui/run-directory.correct.stdout rename to tests/rustdoc-ui/doctest/run-directory.correct.stdout diff --git a/tests/rustdoc-ui/run-directory.incorrect.stdout b/tests/rustdoc-ui/doctest/run-directory.incorrect.stdout similarity index 100% rename from tests/rustdoc-ui/run-directory.incorrect.stdout rename to tests/rustdoc-ui/doctest/run-directory.incorrect.stdout diff --git a/tests/rustdoc-ui/run-directory.rs b/tests/rustdoc-ui/doctest/run-directory.rs similarity index 70% rename from tests/rustdoc-ui/run-directory.rs rename to tests/rustdoc-ui/doctest/run-directory.rs index b8d0647f08d8e..1ff0af2d17cb3 100644 --- a/tests/rustdoc-ui/run-directory.rs +++ b/tests/rustdoc-ui/doctest/run-directory.rs @@ -4,12 +4,12 @@ // 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"), /// ); /// ``` @@ -17,7 +17,7 @@ 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 b/tests/rustdoc-ui/doctest/test-compile-fail1.rs similarity index 100% rename from tests/rustdoc-ui/test-compile-fail1.rs rename to tests/rustdoc-ui/doctest/test-compile-fail1.rs diff --git a/tests/rustdoc-ui/test-compile-fail1.stderr b/tests/rustdoc-ui/doctest/test-compile-fail1.stderr similarity index 100% rename from tests/rustdoc-ui/test-compile-fail1.stderr rename to tests/rustdoc-ui/doctest/test-compile-fail1.stderr diff --git a/tests/rustdoc-ui/test-compile-fail2.rs b/tests/rustdoc-ui/doctest/test-compile-fail2.rs similarity index 100% rename from tests/rustdoc-ui/test-compile-fail2.rs rename to tests/rustdoc-ui/doctest/test-compile-fail2.rs diff --git a/tests/rustdoc-ui/test-compile-fail2.stderr b/tests/rustdoc-ui/doctest/test-compile-fail2.stderr similarity index 100% rename from tests/rustdoc-ui/test-compile-fail2.stderr rename to tests/rustdoc-ui/doctest/test-compile-fail2.stderr diff --git a/tests/rustdoc-ui/test-compile-fail3.rs b/tests/rustdoc-ui/doctest/test-compile-fail3.rs similarity index 100% rename from tests/rustdoc-ui/test-compile-fail3.rs rename to tests/rustdoc-ui/doctest/test-compile-fail3.rs diff --git a/tests/rustdoc-ui/test-compile-fail3.stderr b/tests/rustdoc-ui/doctest/test-compile-fail3.stderr similarity index 100% rename from tests/rustdoc-ui/test-compile-fail3.stderr rename to tests/rustdoc-ui/doctest/test-compile-fail3.stderr diff --git a/tests/rustdoc-ui/test-no_std.rs b/tests/rustdoc-ui/doctest/test-no_std.rs similarity index 75% rename from tests/rustdoc-ui/test-no_std.rs rename to tests/rustdoc-ui/doctest/test-no_std.rs index 51abf1c721768..fd651d1a34421 100644 --- a/tests/rustdoc-ui/test-no_std.rs +++ b/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 b/tests/rustdoc-ui/doctest/test-no_std.stdout similarity index 100% rename from tests/rustdoc-ui/test-no_std.stdout rename to tests/rustdoc-ui/doctest/test-no_std.stdout diff --git a/tests/rustdoc-ui/test-type.rs b/tests/rustdoc-ui/doctest/test-type.rs similarity index 87% rename from tests/rustdoc-ui/test-type.rs rename to tests/rustdoc-ui/doctest/test-type.rs index 7f5a8f3fc415a..036d37f9db2b2 100644 --- a/tests/rustdoc-ui/test-type.rs +++ b/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 b/tests/rustdoc-ui/doctest/test-type.stdout similarity index 100% rename from tests/rustdoc-ui/test-type.stdout rename to tests/rustdoc-ui/doctest/test-type.stdout diff --git a/tests/rustdoc-ui/unparseable-doc-test.rs b/tests/rustdoc-ui/doctest/unparseable-doc-test.rs similarity index 77% rename from tests/rustdoc-ui/unparseable-doc-test.rs rename to tests/rustdoc-ui/doctest/unparseable-doc-test.rs index f0a56a91bf549..fd8b2094d0201 100644 --- a/tests/rustdoc-ui/unparseable-doc-test.rs +++ b/tests/rustdoc-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 b/tests/rustdoc-ui/doctest/unparseable-doc-test.stdout similarity index 100% rename from tests/rustdoc-ui/unparseable-doc-test.stdout rename to tests/rustdoc-ui/doctest/unparseable-doc-test.stdout diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.rs b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt-unstable.rs similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt-unstable.rs rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt-unstable.rs diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt-unstable.stderr similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt-unstable.stderr rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt-unstable.stderr diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt.rs b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt.rs similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt.rs rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt.rs diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt.stderr b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt.stderr similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt.stderr rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt.stderr diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt2.rs b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt2.rs similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt2.rs rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt2.rs diff --git a/tests/rustdoc-ui/generate-link-to-definition-opt2.stderr b/tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt2.stderr similarity index 100% rename from tests/rustdoc-ui/generate-link-to-definition-opt2.stderr rename to tests/rustdoc-ui/generate-link-to-definition/generate-link-to-definition-opt2.stderr diff --git a/tests/rustdoc-ui/deny-intra-link-resolution-failure.rs b/tests/rustdoc-ui/intra-doc/deny-intra-link-resolution-failure.rs similarity index 100% rename from tests/rustdoc-ui/deny-intra-link-resolution-failure.rs rename to tests/rustdoc-ui/intra-doc/deny-intra-link-resolution-failure.rs diff --git a/tests/rustdoc-ui/deny-intra-link-resolution-failure.stderr b/tests/rustdoc-ui/intra-doc/deny-intra-link-resolution-failure.stderr similarity index 100% rename from tests/rustdoc-ui/deny-intra-link-resolution-failure.stderr rename to tests/rustdoc-ui/intra-doc/deny-intra-link-resolution-failure.stderr diff --git a/tests/rustdoc-ui/auxiliary/empty-fn.rs b/tests/rustdoc-ui/issues/auxiliary/empty-fn.rs similarity index 100% rename from tests/rustdoc-ui/auxiliary/empty-fn.rs rename to tests/rustdoc-ui/issues/auxiliary/empty-fn.rs diff --git a/tests/rustdoc-ui/auxiliary/issue-61592.rs b/tests/rustdoc-ui/issues/auxiliary/issue-61592.rs similarity index 100% rename from tests/rustdoc-ui/auxiliary/issue-61592.rs rename to tests/rustdoc-ui/issues/auxiliary/issue-61592.rs diff --git a/tests/rustdoc-ui/auxiliary/panic-handler.rs b/tests/rustdoc-ui/issues/auxiliary/panic-handler.rs similarity index 100% rename from tests/rustdoc-ui/auxiliary/panic-handler.rs rename to tests/rustdoc-ui/issues/auxiliary/panic-handler.rs diff --git a/tests/rustdoc-ui/issue-101076.rs b/tests/rustdoc-ui/issues/issue-101076.rs similarity index 100% rename from tests/rustdoc-ui/issue-101076.rs rename to tests/rustdoc-ui/issues/issue-101076.rs diff --git a/tests/rustdoc-ui/issue-102986.rs b/tests/rustdoc-ui/issues/issue-102986.rs similarity index 100% rename from tests/rustdoc-ui/issue-102986.rs rename to tests/rustdoc-ui/issues/issue-102986.rs diff --git a/tests/rustdoc-ui/issue-102986.stderr b/tests/rustdoc-ui/issues/issue-102986.stderr similarity index 100% rename from tests/rustdoc-ui/issue-102986.stderr rename to tests/rustdoc-ui/issues/issue-102986.stderr diff --git a/tests/rustdoc-ui/issue-103997.rs b/tests/rustdoc-ui/issues/issue-103997.rs similarity index 100% rename from tests/rustdoc-ui/issue-103997.rs rename to tests/rustdoc-ui/issues/issue-103997.rs diff --git a/tests/rustdoc-ui/issue-103997.stderr b/tests/rustdoc-ui/issues/issue-103997.stderr similarity index 100% rename from tests/rustdoc-ui/issue-103997.stderr rename to tests/rustdoc-ui/issues/issue-103997.stderr diff --git a/tests/rustdoc-ui/issue-105334.rs b/tests/rustdoc-ui/issues/issue-105334.rs similarity index 100% rename from tests/rustdoc-ui/issue-105334.rs rename to tests/rustdoc-ui/issues/issue-105334.rs diff --git a/tests/rustdoc-ui/issue-105334.stderr b/tests/rustdoc-ui/issues/issue-105334.stderr similarity index 100% rename from tests/rustdoc-ui/issue-105334.stderr rename to tests/rustdoc-ui/issues/issue-105334.stderr diff --git a/tests/rustdoc-ui/issue-105737.rs b/tests/rustdoc-ui/issues/issue-105737.rs similarity index 100% rename from tests/rustdoc-ui/issue-105737.rs rename to tests/rustdoc-ui/issues/issue-105737.rs diff --git a/tests/rustdoc-ui/issue-105737.stderr b/tests/rustdoc-ui/issues/issue-105737.stderr similarity index 100% rename from tests/rustdoc-ui/issue-105737.stderr rename to tests/rustdoc-ui/issues/issue-105737.stderr diff --git a/tests/rustdoc-ui/issue-105742.rs b/tests/rustdoc-ui/issues/issue-105742.rs similarity index 100% rename from tests/rustdoc-ui/issue-105742.rs rename to tests/rustdoc-ui/issues/issue-105742.rs diff --git a/tests/rustdoc-ui/issue-105742.stderr b/tests/rustdoc-ui/issues/issue-105742.stderr similarity index 100% rename from tests/rustdoc-ui/issue-105742.stderr rename to tests/rustdoc-ui/issues/issue-105742.stderr diff --git a/tests/rustdoc-ui/issue-106213.rs b/tests/rustdoc-ui/issues/issue-106213.rs similarity index 100% rename from tests/rustdoc-ui/issue-106213.rs rename to tests/rustdoc-ui/issues/issue-106213.rs diff --git a/tests/rustdoc-ui/issue-106213.stderr b/tests/rustdoc-ui/issues/issue-106213.stderr similarity index 100% rename from tests/rustdoc-ui/issue-106213.stderr rename to tests/rustdoc-ui/issues/issue-106213.stderr diff --git a/tests/rustdoc-ui/issue-106226.rs b/tests/rustdoc-ui/issues/issue-106226.rs similarity index 100% rename from tests/rustdoc-ui/issue-106226.rs rename to tests/rustdoc-ui/issues/issue-106226.rs diff --git a/tests/rustdoc-ui/issue-106226.stderr b/tests/rustdoc-ui/issues/issue-106226.stderr similarity index 100% rename from tests/rustdoc-ui/issue-106226.stderr rename to tests/rustdoc-ui/issues/issue-106226.stderr diff --git a/tests/rustdoc-ui/issue-107918.rs b/tests/rustdoc-ui/issues/issue-107918.rs similarity index 100% rename from tests/rustdoc-ui/issue-107918.rs rename to tests/rustdoc-ui/issues/issue-107918.rs diff --git a/tests/rustdoc-ui/issue-109282-import-inline-merge.rs b/tests/rustdoc-ui/issues/issue-109282-import-inline-merge.rs similarity index 100% rename from tests/rustdoc-ui/issue-109282-import-inline-merge.rs rename to tests/rustdoc-ui/issues/issue-109282-import-inline-merge.rs diff --git a/tests/rustdoc-ui/issue-110900.rs b/tests/rustdoc-ui/issues/issue-110900.rs similarity index 100% rename from tests/rustdoc-ui/issue-110900.rs rename to tests/rustdoc-ui/issues/issue-110900.rs diff --git a/tests/rustdoc-ui/issue-58473-2.rs b/tests/rustdoc-ui/issues/issue-58473-2.rs similarity index 100% rename from tests/rustdoc-ui/issue-58473-2.rs rename to tests/rustdoc-ui/issues/issue-58473-2.rs diff --git a/tests/rustdoc-ui/issue-58473.rs b/tests/rustdoc-ui/issues/issue-58473.rs similarity index 100% rename from tests/rustdoc-ui/issue-58473.rs rename to tests/rustdoc-ui/issues/issue-58473.rs diff --git a/tests/rustdoc-ui/issue-61592-2.rs b/tests/rustdoc-ui/issues/issue-61592-2.rs similarity index 100% rename from tests/rustdoc-ui/issue-61592-2.rs rename to tests/rustdoc-ui/issues/issue-61592-2.rs diff --git a/tests/rustdoc-ui/issue-61592-2.stderr b/tests/rustdoc-ui/issues/issue-61592-2.stderr similarity index 100% rename from tests/rustdoc-ui/issue-61592-2.stderr rename to tests/rustdoc-ui/issues/issue-61592-2.stderr diff --git a/tests/rustdoc-ui/issue-61592.rs b/tests/rustdoc-ui/issues/issue-61592.rs similarity index 100% rename from tests/rustdoc-ui/issue-61592.rs rename to tests/rustdoc-ui/issues/issue-61592.rs diff --git a/tests/rustdoc-ui/issue-61592.stderr b/tests/rustdoc-ui/issues/issue-61592.stderr similarity index 100% rename from tests/rustdoc-ui/issue-61592.stderr rename to tests/rustdoc-ui/issues/issue-61592.stderr diff --git a/tests/rustdoc-ui/issue-61732.rs b/tests/rustdoc-ui/issues/issue-61732.rs similarity index 100% rename from tests/rustdoc-ui/issue-61732.rs rename to tests/rustdoc-ui/issues/issue-61732.rs diff --git a/tests/rustdoc-ui/issue-61732.stderr b/tests/rustdoc-ui/issues/issue-61732.stderr similarity index 100% rename from tests/rustdoc-ui/issue-61732.stderr rename to tests/rustdoc-ui/issues/issue-61732.stderr diff --git a/tests/rustdoc-ui/issue-74134.private.stderr b/tests/rustdoc-ui/issues/issue-74134.private.stderr similarity index 100% rename from tests/rustdoc-ui/issue-74134.private.stderr rename to tests/rustdoc-ui/issues/issue-74134.private.stderr diff --git a/tests/rustdoc-ui/issue-74134.public.stderr b/tests/rustdoc-ui/issues/issue-74134.public.stderr similarity index 100% rename from tests/rustdoc-ui/issue-74134.public.stderr rename to tests/rustdoc-ui/issues/issue-74134.public.stderr diff --git a/tests/rustdoc-ui/issue-74134.rs b/tests/rustdoc-ui/issues/issue-74134.rs similarity index 100% rename from tests/rustdoc-ui/issue-74134.rs rename to tests/rustdoc-ui/issues/issue-74134.rs diff --git a/tests/rustdoc-ui/issue-79465.rs b/tests/rustdoc-ui/issues/issue-79465.rs similarity index 100% rename from tests/rustdoc-ui/issue-79465.rs rename to tests/rustdoc-ui/issues/issue-79465.rs diff --git a/tests/rustdoc-ui/issue-79465.stderr b/tests/rustdoc-ui/issues/issue-79465.stderr similarity index 100% rename from tests/rustdoc-ui/issue-79465.stderr rename to tests/rustdoc-ui/issues/issue-79465.stderr diff --git a/tests/rustdoc-ui/issue-79467.rs b/tests/rustdoc-ui/issues/issue-79467.rs similarity index 100% rename from tests/rustdoc-ui/issue-79467.rs rename to tests/rustdoc-ui/issues/issue-79467.rs diff --git a/tests/rustdoc-ui/issue-79467.stderr b/tests/rustdoc-ui/issues/issue-79467.stderr similarity index 100% rename from tests/rustdoc-ui/issue-79467.stderr rename to tests/rustdoc-ui/issues/issue-79467.stderr diff --git a/tests/rustdoc-ui/issue-79494.rs b/tests/rustdoc-ui/issues/issue-79494.rs similarity index 100% rename from tests/rustdoc-ui/issue-79494.rs rename to tests/rustdoc-ui/issues/issue-79494.rs diff --git a/tests/rustdoc-ui/issue-79494.stderr b/tests/rustdoc-ui/issues/issue-79494.stderr similarity index 100% rename from tests/rustdoc-ui/issue-79494.stderr rename to tests/rustdoc-ui/issues/issue-79494.stderr diff --git a/tests/rustdoc-ui/issue-80992.rs b/tests/rustdoc-ui/issues/issue-80992.rs similarity index 78% rename from tests/rustdoc-ui/issue-80992.rs rename to tests/rustdoc-ui/issues/issue-80992.rs index 80ff225b8791f..f5ae16981ca11 100644 --- a/tests/rustdoc-ui/issue-80992.rs +++ b/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 b/tests/rustdoc-ui/issues/issue-80992.stdout similarity index 100% rename from tests/rustdoc-ui/issue-80992.stdout rename to tests/rustdoc-ui/issues/issue-80992.stdout diff --git a/tests/rustdoc-ui/issue-81662-shortness.rs b/tests/rustdoc-ui/issues/issue-81662-shortness.rs similarity index 81% rename from tests/rustdoc-ui/issue-81662-shortness.rs rename to tests/rustdoc-ui/issues/issue-81662-shortness.rs index 8a90813b31d52..0240d217bee52 100644 --- a/tests/rustdoc-ui/issue-81662-shortness.rs +++ b/tests/rustdoc-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/tests/rustdoc-ui/issue-81662-shortness.stdout b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout similarity index 100% rename from tests/rustdoc-ui/issue-81662-shortness.stdout rename to tests/rustdoc-ui/issues/issue-81662-shortness.stdout diff --git a/tests/rustdoc-ui/issue-83883-describe-lints.rs b/tests/rustdoc-ui/issues/issue-83883-describe-lints.rs similarity index 100% rename from tests/rustdoc-ui/issue-83883-describe-lints.rs rename to tests/rustdoc-ui/issues/issue-83883-describe-lints.rs diff --git a/tests/rustdoc-ui/issue-83883-describe-lints.stdout b/tests/rustdoc-ui/issues/issue-83883-describe-lints.stdout similarity index 100% rename from tests/rustdoc-ui/issue-83883-describe-lints.stdout rename to tests/rustdoc-ui/issues/issue-83883-describe-lints.stdout diff --git a/tests/rustdoc-ui/issue-91134.rs b/tests/rustdoc-ui/issues/issue-91134.rs similarity index 85% rename from tests/rustdoc-ui/issue-91134.rs rename to tests/rustdoc-ui/issues/issue-91134.rs index 42703ee4d7998..85362f186cc7f 100644 --- a/tests/rustdoc-ui/issue-91134.rs +++ b/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 b/tests/rustdoc-ui/issues/issue-91134.stdout similarity index 100% rename from tests/rustdoc-ui/issue-91134.stdout rename to tests/rustdoc-ui/issues/issue-91134.stdout diff --git a/tests/rustdoc-ui/issue-91713.rs b/tests/rustdoc-ui/issues/issue-91713.rs similarity index 100% rename from tests/rustdoc-ui/issue-91713.rs rename to tests/rustdoc-ui/issues/issue-91713.rs diff --git a/tests/rustdoc-ui/issue-91713.stderr b/tests/rustdoc-ui/issues/issue-91713.stderr similarity index 100% rename from tests/rustdoc-ui/issue-91713.stderr rename to tests/rustdoc-ui/issues/issue-91713.stderr diff --git a/tests/rustdoc-ui/issue-91713.stdout b/tests/rustdoc-ui/issues/issue-91713.stdout similarity index 100% rename from tests/rustdoc-ui/issue-91713.stdout rename to tests/rustdoc-ui/issues/issue-91713.stdout diff --git a/tests/rustdoc-ui/issue-96287.rs b/tests/rustdoc-ui/issues/issue-96287.rs similarity index 100% rename from tests/rustdoc-ui/issue-96287.rs rename to tests/rustdoc-ui/issues/issue-96287.rs diff --git a/tests/rustdoc-ui/issue-96287.stderr b/tests/rustdoc-ui/issues/issue-96287.stderr similarity index 100% rename from tests/rustdoc-ui/issue-96287.stderr rename to tests/rustdoc-ui/issues/issue-96287.stderr diff --git a/tests/rustdoc-ui/issue-98690.rs b/tests/rustdoc-ui/issues/issue-98690.rs similarity index 100% rename from tests/rustdoc-ui/issue-98690.rs rename to tests/rustdoc-ui/issues/issue-98690.rs diff --git a/tests/rustdoc-ui/issue-98690.stderr b/tests/rustdoc-ui/issues/issue-98690.stderr similarity index 100% rename from tests/rustdoc-ui/issue-98690.stderr rename to tests/rustdoc-ui/issues/issue-98690.stderr diff --git a/tests/rustdoc-ui/scrape-examples-fail-if-type-error.rs b/tests/rustdoc-ui/scrape-examples/scrape-examples-fail-if-type-error.rs similarity index 100% rename from tests/rustdoc-ui/scrape-examples-fail-if-type-error.rs rename to tests/rustdoc-ui/scrape-examples/scrape-examples-fail-if-type-error.rs diff --git a/tests/rustdoc-ui/scrape-examples-fail-if-type-error.stderr b/tests/rustdoc-ui/scrape-examples/scrape-examples-fail-if-type-error.stderr similarity index 100% rename from tests/rustdoc-ui/scrape-examples-fail-if-type-error.stderr rename to tests/rustdoc-ui/scrape-examples/scrape-examples-fail-if-type-error.stderr diff --git a/tests/rustdoc-ui/scrape-examples-ice.rs b/tests/rustdoc-ui/scrape-examples/scrape-examples-ice.rs similarity index 100% rename from tests/rustdoc-ui/scrape-examples-ice.rs rename to tests/rustdoc-ui/scrape-examples/scrape-examples-ice.rs diff --git a/tests/rustdoc-ui/scrape-examples-wrong-options-1.rs b/tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-1.rs similarity index 100% rename from tests/rustdoc-ui/scrape-examples-wrong-options-1.rs rename to tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-1.rs diff --git a/tests/rustdoc-ui/scrape-examples-wrong-options-1.stderr b/tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-1.stderr similarity index 100% rename from tests/rustdoc-ui/scrape-examples-wrong-options-1.stderr rename to tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-1.stderr diff --git a/tests/rustdoc-ui/scrape-examples-wrong-options-2.rs b/tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-2.rs similarity index 100% rename from tests/rustdoc-ui/scrape-examples-wrong-options-2.rs rename to tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-2.rs diff --git a/tests/rustdoc-ui/scrape-examples-wrong-options-2.stderr b/tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-2.stderr similarity index 100% rename from tests/rustdoc-ui/scrape-examples-wrong-options-2.stderr rename to tests/rustdoc-ui/scrape-examples/scrape-examples-wrong-options-2.stderr From 5da288f842f5616d58dc98338a833addf8a3cb2b Mon Sep 17 00:00:00 2001 From: jyn Date: Sat, 29 Apr 2023 04:25:04 -0500 Subject: [PATCH 2/2] move lint tests into subdirectories --- tests/rustdoc-ui/{ => intra-doc}/assoc-item-not-in-scope.rs | 0 tests/rustdoc-ui/{ => intra-doc}/assoc-item-not-in-scope.stderr | 0 tests/rustdoc-ui/{ => intra-doc}/pub-export-lint.rs | 0 tests/rustdoc-ui/{ => intra-doc}/pub-export-lint.stderr | 0 .../{ => intra-doc}/reference-link-reports-error-once.rs | 0 .../{ => intra-doc}/reference-link-reports-error-once.stderr | 0 tests/rustdoc-ui/{ => intra-doc}/reference-links.rs | 0 tests/rustdoc-ui/{ => intra-doc}/reference-links.stderr | 0 tests/rustdoc-ui/{ => lints}/bare-urls.fixed | 0 tests/rustdoc-ui/{ => lints}/bare-urls.rs | 0 tests/rustdoc-ui/{ => lints}/bare-urls.stderr | 0 tests/rustdoc-ui/{ => lints}/check-attr.rs | 0 tests/rustdoc-ui/{ => lints}/check-attr.stderr | 0 tests/rustdoc-ui/{ => lints}/check-fail.rs | 0 tests/rustdoc-ui/{ => lints}/check-fail.stderr | 0 tests/rustdoc-ui/{ => lints}/check.rs | 0 tests/rustdoc-ui/{ => lints}/check.stderr | 0 tests/rustdoc-ui/{ => lints}/deny-missing-docs-crate.rs | 0 tests/rustdoc-ui/{ => lints}/deny-missing-docs-crate.stderr | 0 tests/rustdoc-ui/{ => lints}/deny-missing-docs-macro.rs | 0 tests/rustdoc-ui/{ => lints}/deny-missing-docs-macro.stderr | 0 tests/rustdoc-ui/{ => lints}/doc-attr.rs | 0 tests/rustdoc-ui/{ => lints}/doc-attr.stderr | 0 tests/rustdoc-ui/{ => lints}/doc-spotlight.fixed | 0 tests/rustdoc-ui/{ => lints}/doc-spotlight.rs | 0 tests/rustdoc-ui/{ => lints}/doc-spotlight.stderr | 0 tests/rustdoc-ui/{ => lints}/doc-without-codeblock.rs | 0 tests/rustdoc-ui/{ => lints}/doc-without-codeblock.stderr | 0 tests/rustdoc-ui/{ => lints}/doc_cfg_hide.rs | 0 tests/rustdoc-ui/{ => lints}/doc_cfg_hide.stderr | 0 tests/rustdoc-ui/{ => lints}/expect-tool-lint-rfc-2383.rs | 0 tests/rustdoc-ui/{ => lints}/expect-tool-lint-rfc-2383.stderr | 0 .../{ => lints}/feature-gate-rustdoc_missing_doc_code_examples.rs | 0 .../feature-gate-rustdoc_missing_doc_code_examples.stderr | 0 tests/rustdoc-ui/{ => lints}/invalid-doc-attr.rs | 0 tests/rustdoc-ui/{ => lints}/invalid-doc-attr.stderr | 0 tests/rustdoc-ui/{ => lints}/invalid-html-self-closing-tag.rs | 0 tests/rustdoc-ui/{ => lints}/invalid-html-self-closing-tag.stderr | 0 tests/rustdoc-ui/{ => lints}/invalid-html-tags.rs | 0 tests/rustdoc-ui/{ => lints}/invalid-html-tags.stderr | 0 tests/rustdoc-ui/{ => lints}/lint-group.rs | 0 tests/rustdoc-ui/{ => lints}/lint-group.stderr | 0 tests/rustdoc-ui/{ => lints}/lint-missing-doc-code-example.rs | 0 tests/rustdoc-ui/{ => lints}/lint-missing-doc-code-example.stderr | 0 tests/rustdoc-ui/{ => lints}/no-crate-level-doc-lint.rs | 0 tests/rustdoc-ui/{ => lints}/no-crate-level-doc-lint.stderr | 0 tests/rustdoc-ui/{ => lints}/renamed-lint-still-applies.rs | 0 tests/rustdoc-ui/{ => lints}/renamed-lint-still-applies.stderr | 0 tests/rustdoc-ui/{ => lints}/rustdoc-all-only-stable-lints.rs | 0 tests/rustdoc-ui/{ => lints}/unknown-renamed-lints.rs | 0 tests/rustdoc-ui/{ => lints}/unknown-renamed-lints.stderr | 0 tests/rustdoc-ui/{ => lints}/unused-braces-lint.rs | 0 tests/rustdoc-ui/{ => lints}/unused.rs | 0 53 files changed, 0 insertions(+), 0 deletions(-) rename tests/rustdoc-ui/{ => intra-doc}/assoc-item-not-in-scope.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/assoc-item-not-in-scope.stderr (100%) rename tests/rustdoc-ui/{ => intra-doc}/pub-export-lint.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/pub-export-lint.stderr (100%) rename tests/rustdoc-ui/{ => intra-doc}/reference-link-reports-error-once.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/reference-link-reports-error-once.stderr (100%) rename tests/rustdoc-ui/{ => intra-doc}/reference-links.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/reference-links.stderr (100%) rename tests/rustdoc-ui/{ => lints}/bare-urls.fixed (100%) rename tests/rustdoc-ui/{ => lints}/bare-urls.rs (100%) rename tests/rustdoc-ui/{ => lints}/bare-urls.stderr (100%) rename tests/rustdoc-ui/{ => lints}/check-attr.rs (100%) rename tests/rustdoc-ui/{ => lints}/check-attr.stderr (100%) rename tests/rustdoc-ui/{ => lints}/check-fail.rs (100%) rename tests/rustdoc-ui/{ => lints}/check-fail.stderr (100%) rename tests/rustdoc-ui/{ => lints}/check.rs (100%) rename tests/rustdoc-ui/{ => lints}/check.stderr (100%) rename tests/rustdoc-ui/{ => lints}/deny-missing-docs-crate.rs (100%) rename tests/rustdoc-ui/{ => lints}/deny-missing-docs-crate.stderr (100%) rename tests/rustdoc-ui/{ => lints}/deny-missing-docs-macro.rs (100%) rename tests/rustdoc-ui/{ => lints}/deny-missing-docs-macro.stderr (100%) rename tests/rustdoc-ui/{ => lints}/doc-attr.rs (100%) rename tests/rustdoc-ui/{ => lints}/doc-attr.stderr (100%) rename tests/rustdoc-ui/{ => lints}/doc-spotlight.fixed (100%) rename tests/rustdoc-ui/{ => lints}/doc-spotlight.rs (100%) rename tests/rustdoc-ui/{ => lints}/doc-spotlight.stderr (100%) rename tests/rustdoc-ui/{ => lints}/doc-without-codeblock.rs (100%) rename tests/rustdoc-ui/{ => lints}/doc-without-codeblock.stderr (100%) rename tests/rustdoc-ui/{ => lints}/doc_cfg_hide.rs (100%) rename tests/rustdoc-ui/{ => lints}/doc_cfg_hide.stderr (100%) rename tests/rustdoc-ui/{ => lints}/expect-tool-lint-rfc-2383.rs (100%) rename tests/rustdoc-ui/{ => lints}/expect-tool-lint-rfc-2383.stderr (100%) rename tests/rustdoc-ui/{ => lints}/feature-gate-rustdoc_missing_doc_code_examples.rs (100%) rename tests/rustdoc-ui/{ => lints}/feature-gate-rustdoc_missing_doc_code_examples.stderr (100%) rename tests/rustdoc-ui/{ => lints}/invalid-doc-attr.rs (100%) rename tests/rustdoc-ui/{ => lints}/invalid-doc-attr.stderr (100%) rename tests/rustdoc-ui/{ => lints}/invalid-html-self-closing-tag.rs (100%) rename tests/rustdoc-ui/{ => lints}/invalid-html-self-closing-tag.stderr (100%) rename tests/rustdoc-ui/{ => lints}/invalid-html-tags.rs (100%) rename tests/rustdoc-ui/{ => lints}/invalid-html-tags.stderr (100%) rename tests/rustdoc-ui/{ => lints}/lint-group.rs (100%) rename tests/rustdoc-ui/{ => lints}/lint-group.stderr (100%) rename tests/rustdoc-ui/{ => lints}/lint-missing-doc-code-example.rs (100%) rename tests/rustdoc-ui/{ => lints}/lint-missing-doc-code-example.stderr (100%) rename tests/rustdoc-ui/{ => lints}/no-crate-level-doc-lint.rs (100%) rename tests/rustdoc-ui/{ => lints}/no-crate-level-doc-lint.stderr (100%) rename tests/rustdoc-ui/{ => lints}/renamed-lint-still-applies.rs (100%) rename tests/rustdoc-ui/{ => lints}/renamed-lint-still-applies.stderr (100%) rename tests/rustdoc-ui/{ => lints}/rustdoc-all-only-stable-lints.rs (100%) rename tests/rustdoc-ui/{ => lints}/unknown-renamed-lints.rs (100%) rename tests/rustdoc-ui/{ => lints}/unknown-renamed-lints.stderr (100%) rename tests/rustdoc-ui/{ => lints}/unused-braces-lint.rs (100%) rename tests/rustdoc-ui/{ => lints}/unused.rs (100%) diff --git a/tests/rustdoc-ui/assoc-item-not-in-scope.rs b/tests/rustdoc-ui/intra-doc/assoc-item-not-in-scope.rs similarity index 100% rename from tests/rustdoc-ui/assoc-item-not-in-scope.rs rename to tests/rustdoc-ui/intra-doc/assoc-item-not-in-scope.rs diff --git a/tests/rustdoc-ui/assoc-item-not-in-scope.stderr b/tests/rustdoc-ui/intra-doc/assoc-item-not-in-scope.stderr similarity index 100% rename from tests/rustdoc-ui/assoc-item-not-in-scope.stderr rename to tests/rustdoc-ui/intra-doc/assoc-item-not-in-scope.stderr diff --git a/tests/rustdoc-ui/pub-export-lint.rs b/tests/rustdoc-ui/intra-doc/pub-export-lint.rs similarity index 100% rename from tests/rustdoc-ui/pub-export-lint.rs rename to tests/rustdoc-ui/intra-doc/pub-export-lint.rs diff --git a/tests/rustdoc-ui/pub-export-lint.stderr b/tests/rustdoc-ui/intra-doc/pub-export-lint.stderr similarity index 100% rename from tests/rustdoc-ui/pub-export-lint.stderr rename to tests/rustdoc-ui/intra-doc/pub-export-lint.stderr diff --git a/tests/rustdoc-ui/reference-link-reports-error-once.rs b/tests/rustdoc-ui/intra-doc/reference-link-reports-error-once.rs similarity index 100% rename from tests/rustdoc-ui/reference-link-reports-error-once.rs rename to tests/rustdoc-ui/intra-doc/reference-link-reports-error-once.rs diff --git a/tests/rustdoc-ui/reference-link-reports-error-once.stderr b/tests/rustdoc-ui/intra-doc/reference-link-reports-error-once.stderr similarity index 100% rename from tests/rustdoc-ui/reference-link-reports-error-once.stderr rename to tests/rustdoc-ui/intra-doc/reference-link-reports-error-once.stderr diff --git a/tests/rustdoc-ui/reference-links.rs b/tests/rustdoc-ui/intra-doc/reference-links.rs similarity index 100% rename from tests/rustdoc-ui/reference-links.rs rename to tests/rustdoc-ui/intra-doc/reference-links.rs diff --git a/tests/rustdoc-ui/reference-links.stderr b/tests/rustdoc-ui/intra-doc/reference-links.stderr similarity index 100% rename from tests/rustdoc-ui/reference-links.stderr rename to tests/rustdoc-ui/intra-doc/reference-links.stderr diff --git a/tests/rustdoc-ui/bare-urls.fixed b/tests/rustdoc-ui/lints/bare-urls.fixed similarity index 100% rename from tests/rustdoc-ui/bare-urls.fixed rename to tests/rustdoc-ui/lints/bare-urls.fixed diff --git a/tests/rustdoc-ui/bare-urls.rs b/tests/rustdoc-ui/lints/bare-urls.rs similarity index 100% rename from tests/rustdoc-ui/bare-urls.rs rename to tests/rustdoc-ui/lints/bare-urls.rs diff --git a/tests/rustdoc-ui/bare-urls.stderr b/tests/rustdoc-ui/lints/bare-urls.stderr similarity index 100% rename from tests/rustdoc-ui/bare-urls.stderr rename to tests/rustdoc-ui/lints/bare-urls.stderr diff --git a/tests/rustdoc-ui/check-attr.rs b/tests/rustdoc-ui/lints/check-attr.rs similarity index 100% rename from tests/rustdoc-ui/check-attr.rs rename to tests/rustdoc-ui/lints/check-attr.rs diff --git a/tests/rustdoc-ui/check-attr.stderr b/tests/rustdoc-ui/lints/check-attr.stderr similarity index 100% rename from tests/rustdoc-ui/check-attr.stderr rename to tests/rustdoc-ui/lints/check-attr.stderr diff --git a/tests/rustdoc-ui/check-fail.rs b/tests/rustdoc-ui/lints/check-fail.rs similarity index 100% rename from tests/rustdoc-ui/check-fail.rs rename to tests/rustdoc-ui/lints/check-fail.rs diff --git a/tests/rustdoc-ui/check-fail.stderr b/tests/rustdoc-ui/lints/check-fail.stderr similarity index 100% rename from tests/rustdoc-ui/check-fail.stderr rename to tests/rustdoc-ui/lints/check-fail.stderr diff --git a/tests/rustdoc-ui/check.rs b/tests/rustdoc-ui/lints/check.rs similarity index 100% rename from tests/rustdoc-ui/check.rs rename to tests/rustdoc-ui/lints/check.rs diff --git a/tests/rustdoc-ui/check.stderr b/tests/rustdoc-ui/lints/check.stderr similarity index 100% rename from tests/rustdoc-ui/check.stderr rename to tests/rustdoc-ui/lints/check.stderr diff --git a/tests/rustdoc-ui/deny-missing-docs-crate.rs b/tests/rustdoc-ui/lints/deny-missing-docs-crate.rs similarity index 100% rename from tests/rustdoc-ui/deny-missing-docs-crate.rs rename to tests/rustdoc-ui/lints/deny-missing-docs-crate.rs diff --git a/tests/rustdoc-ui/deny-missing-docs-crate.stderr b/tests/rustdoc-ui/lints/deny-missing-docs-crate.stderr similarity index 100% rename from tests/rustdoc-ui/deny-missing-docs-crate.stderr rename to tests/rustdoc-ui/lints/deny-missing-docs-crate.stderr diff --git a/tests/rustdoc-ui/deny-missing-docs-macro.rs b/tests/rustdoc-ui/lints/deny-missing-docs-macro.rs similarity index 100% rename from tests/rustdoc-ui/deny-missing-docs-macro.rs rename to tests/rustdoc-ui/lints/deny-missing-docs-macro.rs diff --git a/tests/rustdoc-ui/deny-missing-docs-macro.stderr b/tests/rustdoc-ui/lints/deny-missing-docs-macro.stderr similarity index 100% rename from tests/rustdoc-ui/deny-missing-docs-macro.stderr rename to tests/rustdoc-ui/lints/deny-missing-docs-macro.stderr diff --git a/tests/rustdoc-ui/doc-attr.rs b/tests/rustdoc-ui/lints/doc-attr.rs similarity index 100% rename from tests/rustdoc-ui/doc-attr.rs rename to tests/rustdoc-ui/lints/doc-attr.rs diff --git a/tests/rustdoc-ui/doc-attr.stderr b/tests/rustdoc-ui/lints/doc-attr.stderr similarity index 100% rename from tests/rustdoc-ui/doc-attr.stderr rename to tests/rustdoc-ui/lints/doc-attr.stderr diff --git a/tests/rustdoc-ui/doc-spotlight.fixed b/tests/rustdoc-ui/lints/doc-spotlight.fixed similarity index 100% rename from tests/rustdoc-ui/doc-spotlight.fixed rename to tests/rustdoc-ui/lints/doc-spotlight.fixed diff --git a/tests/rustdoc-ui/doc-spotlight.rs b/tests/rustdoc-ui/lints/doc-spotlight.rs similarity index 100% rename from tests/rustdoc-ui/doc-spotlight.rs rename to tests/rustdoc-ui/lints/doc-spotlight.rs diff --git a/tests/rustdoc-ui/doc-spotlight.stderr b/tests/rustdoc-ui/lints/doc-spotlight.stderr similarity index 100% rename from tests/rustdoc-ui/doc-spotlight.stderr rename to tests/rustdoc-ui/lints/doc-spotlight.stderr diff --git a/tests/rustdoc-ui/doc-without-codeblock.rs b/tests/rustdoc-ui/lints/doc-without-codeblock.rs similarity index 100% rename from tests/rustdoc-ui/doc-without-codeblock.rs rename to tests/rustdoc-ui/lints/doc-without-codeblock.rs diff --git a/tests/rustdoc-ui/doc-without-codeblock.stderr b/tests/rustdoc-ui/lints/doc-without-codeblock.stderr similarity index 100% rename from tests/rustdoc-ui/doc-without-codeblock.stderr rename to tests/rustdoc-ui/lints/doc-without-codeblock.stderr diff --git a/tests/rustdoc-ui/doc_cfg_hide.rs b/tests/rustdoc-ui/lints/doc_cfg_hide.rs similarity index 100% rename from tests/rustdoc-ui/doc_cfg_hide.rs rename to tests/rustdoc-ui/lints/doc_cfg_hide.rs diff --git a/tests/rustdoc-ui/doc_cfg_hide.stderr b/tests/rustdoc-ui/lints/doc_cfg_hide.stderr similarity index 100% rename from tests/rustdoc-ui/doc_cfg_hide.stderr rename to tests/rustdoc-ui/lints/doc_cfg_hide.stderr diff --git a/tests/rustdoc-ui/expect-tool-lint-rfc-2383.rs b/tests/rustdoc-ui/lints/expect-tool-lint-rfc-2383.rs similarity index 100% rename from tests/rustdoc-ui/expect-tool-lint-rfc-2383.rs rename to tests/rustdoc-ui/lints/expect-tool-lint-rfc-2383.rs diff --git a/tests/rustdoc-ui/expect-tool-lint-rfc-2383.stderr b/tests/rustdoc-ui/lints/expect-tool-lint-rfc-2383.stderr similarity index 100% rename from tests/rustdoc-ui/expect-tool-lint-rfc-2383.stderr rename to tests/rustdoc-ui/lints/expect-tool-lint-rfc-2383.stderr diff --git a/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs b/tests/rustdoc-ui/lints/feature-gate-rustdoc_missing_doc_code_examples.rs similarity index 100% rename from tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.rs rename to tests/rustdoc-ui/lints/feature-gate-rustdoc_missing_doc_code_examples.rs diff --git a/tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr b/tests/rustdoc-ui/lints/feature-gate-rustdoc_missing_doc_code_examples.stderr similarity index 100% rename from tests/rustdoc-ui/feature-gate-rustdoc_missing_doc_code_examples.stderr rename to tests/rustdoc-ui/lints/feature-gate-rustdoc_missing_doc_code_examples.stderr diff --git a/tests/rustdoc-ui/invalid-doc-attr.rs b/tests/rustdoc-ui/lints/invalid-doc-attr.rs similarity index 100% rename from tests/rustdoc-ui/invalid-doc-attr.rs rename to tests/rustdoc-ui/lints/invalid-doc-attr.rs diff --git a/tests/rustdoc-ui/invalid-doc-attr.stderr b/tests/rustdoc-ui/lints/invalid-doc-attr.stderr similarity index 100% rename from tests/rustdoc-ui/invalid-doc-attr.stderr rename to tests/rustdoc-ui/lints/invalid-doc-attr.stderr diff --git a/tests/rustdoc-ui/invalid-html-self-closing-tag.rs b/tests/rustdoc-ui/lints/invalid-html-self-closing-tag.rs similarity index 100% rename from tests/rustdoc-ui/invalid-html-self-closing-tag.rs rename to tests/rustdoc-ui/lints/invalid-html-self-closing-tag.rs diff --git a/tests/rustdoc-ui/invalid-html-self-closing-tag.stderr b/tests/rustdoc-ui/lints/invalid-html-self-closing-tag.stderr similarity index 100% rename from tests/rustdoc-ui/invalid-html-self-closing-tag.stderr rename to tests/rustdoc-ui/lints/invalid-html-self-closing-tag.stderr diff --git a/tests/rustdoc-ui/invalid-html-tags.rs b/tests/rustdoc-ui/lints/invalid-html-tags.rs similarity index 100% rename from tests/rustdoc-ui/invalid-html-tags.rs rename to tests/rustdoc-ui/lints/invalid-html-tags.rs diff --git a/tests/rustdoc-ui/invalid-html-tags.stderr b/tests/rustdoc-ui/lints/invalid-html-tags.stderr similarity index 100% rename from tests/rustdoc-ui/invalid-html-tags.stderr rename to tests/rustdoc-ui/lints/invalid-html-tags.stderr diff --git a/tests/rustdoc-ui/lint-group.rs b/tests/rustdoc-ui/lints/lint-group.rs similarity index 100% rename from tests/rustdoc-ui/lint-group.rs rename to tests/rustdoc-ui/lints/lint-group.rs diff --git a/tests/rustdoc-ui/lint-group.stderr b/tests/rustdoc-ui/lints/lint-group.stderr similarity index 100% rename from tests/rustdoc-ui/lint-group.stderr rename to tests/rustdoc-ui/lints/lint-group.stderr diff --git a/tests/rustdoc-ui/lint-missing-doc-code-example.rs b/tests/rustdoc-ui/lints/lint-missing-doc-code-example.rs similarity index 100% rename from tests/rustdoc-ui/lint-missing-doc-code-example.rs rename to tests/rustdoc-ui/lints/lint-missing-doc-code-example.rs diff --git a/tests/rustdoc-ui/lint-missing-doc-code-example.stderr b/tests/rustdoc-ui/lints/lint-missing-doc-code-example.stderr similarity index 100% rename from tests/rustdoc-ui/lint-missing-doc-code-example.stderr rename to tests/rustdoc-ui/lints/lint-missing-doc-code-example.stderr diff --git a/tests/rustdoc-ui/no-crate-level-doc-lint.rs b/tests/rustdoc-ui/lints/no-crate-level-doc-lint.rs similarity index 100% rename from tests/rustdoc-ui/no-crate-level-doc-lint.rs rename to tests/rustdoc-ui/lints/no-crate-level-doc-lint.rs diff --git a/tests/rustdoc-ui/no-crate-level-doc-lint.stderr b/tests/rustdoc-ui/lints/no-crate-level-doc-lint.stderr similarity index 100% rename from tests/rustdoc-ui/no-crate-level-doc-lint.stderr rename to tests/rustdoc-ui/lints/no-crate-level-doc-lint.stderr diff --git a/tests/rustdoc-ui/renamed-lint-still-applies.rs b/tests/rustdoc-ui/lints/renamed-lint-still-applies.rs similarity index 100% rename from tests/rustdoc-ui/renamed-lint-still-applies.rs rename to tests/rustdoc-ui/lints/renamed-lint-still-applies.rs diff --git a/tests/rustdoc-ui/renamed-lint-still-applies.stderr b/tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr similarity index 100% rename from tests/rustdoc-ui/renamed-lint-still-applies.stderr rename to tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr diff --git a/tests/rustdoc-ui/rustdoc-all-only-stable-lints.rs b/tests/rustdoc-ui/lints/rustdoc-all-only-stable-lints.rs similarity index 100% rename from tests/rustdoc-ui/rustdoc-all-only-stable-lints.rs rename to tests/rustdoc-ui/lints/rustdoc-all-only-stable-lints.rs diff --git a/tests/rustdoc-ui/unknown-renamed-lints.rs b/tests/rustdoc-ui/lints/unknown-renamed-lints.rs similarity index 100% rename from tests/rustdoc-ui/unknown-renamed-lints.rs rename to tests/rustdoc-ui/lints/unknown-renamed-lints.rs diff --git a/tests/rustdoc-ui/unknown-renamed-lints.stderr b/tests/rustdoc-ui/lints/unknown-renamed-lints.stderr similarity index 100% rename from tests/rustdoc-ui/unknown-renamed-lints.stderr rename to tests/rustdoc-ui/lints/unknown-renamed-lints.stderr diff --git a/tests/rustdoc-ui/unused-braces-lint.rs b/tests/rustdoc-ui/lints/unused-braces-lint.rs similarity index 100% rename from tests/rustdoc-ui/unused-braces-lint.rs rename to tests/rustdoc-ui/lints/unused-braces-lint.rs diff --git a/tests/rustdoc-ui/unused.rs b/tests/rustdoc-ui/lints/unused.rs similarity index 100% rename from tests/rustdoc-ui/unused.rs rename to tests/rustdoc-ui/lints/unused.rs