From 0715745c1cf5b02c3b776ff23c53039e35a52f50 Mon Sep 17 00:00:00 2001 From: Aarav Desai Date: Sun, 26 Oct 2025 19:16:41 -0700 Subject: [PATCH] Move rustdoc tests to appropriate subdirectories Reorganize rustdoc tests into their correct subdirectories for better categorization: - Move lint-related tests to rustdoc-ui/lints/ - Move intra-doc link tests to rustdoc-ui/intra-doc/ - Move deref-related tests to rustdoc-ui/deref/ - Move doc-cfg test to rustdoc/doc-cfg/ This improves test organization and makes it easier to find tests related to specific rustdoc functionality. --- tests/rustdoc-ui/{ => deref}/deref-generic.rs | 0 tests/rustdoc-ui/{ => deref}/ice-blanket-impl-56701.rs | 0 tests/rustdoc-ui/{ => deref}/recursive-deref-ice.rs | 0 tests/rustdoc-ui/{ => intra-doc}/auxiliary/issue-48414.rs | 0 .../{ => intra-doc}/circular-intra-doc-link-48414.rs | 0 .../{ => intra-doc}/disambiguator-endswith-named-suffix.rs | 0 .../disambiguator-endswith-named-suffix.stderr | 0 .../{ => lints}/custom_code_classes_in_docs-warning3.rs | 0 .../{ => lints}/custom_code_classes_in_docs-warning3.stderr | 0 tests/rustdoc-ui/{ => lints}/diagnostic-width.rs | 0 tests/rustdoc-ui/{ => lints}/diagnostic-width.stderr | 0 tests/rustdoc-ui/{ => lints}/include-str-bare-urls.rs | 2 +- tests/rustdoc-ui/{ => lints}/include-str-bare-urls.stderr | 2 +- .../rustdoc-ui/{ => lints}/redundant-explicit-links-123677.rs | 0 tests/rustdoc-ui/{ => lints}/remap-path-prefix-lint.rs | 0 tests/rustdoc-ui/{ => lints}/remap-path-prefix-lint.stderr | 4 ++-- tests/rustdoc-ui/{ => lints}/unescaped_backticks.rs | 0 tests/rustdoc-ui/{ => lints}/unescaped_backticks.stderr | 0 tests/rustdoc/{ => doc-cfg}/duplicate-cfg.rs | 0 19 files changed, 4 insertions(+), 4 deletions(-) rename tests/rustdoc-ui/{ => deref}/deref-generic.rs (100%) rename tests/rustdoc-ui/{ => deref}/ice-blanket-impl-56701.rs (100%) rename tests/rustdoc-ui/{ => deref}/recursive-deref-ice.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/auxiliary/issue-48414.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/circular-intra-doc-link-48414.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/disambiguator-endswith-named-suffix.rs (100%) rename tests/rustdoc-ui/{ => intra-doc}/disambiguator-endswith-named-suffix.stderr (100%) rename tests/rustdoc-ui/{ => lints}/custom_code_classes_in_docs-warning3.rs (100%) rename tests/rustdoc-ui/{ => lints}/custom_code_classes_in_docs-warning3.stderr (100%) rename tests/rustdoc-ui/{ => lints}/diagnostic-width.rs (100%) rename tests/rustdoc-ui/{ => lints}/diagnostic-width.stderr (100%) rename tests/rustdoc-ui/{ => lints}/include-str-bare-urls.rs (89%) rename tests/rustdoc-ui/{ => lints}/include-str-bare-urls.stderr (91%) rename tests/rustdoc-ui/{ => lints}/redundant-explicit-links-123677.rs (100%) rename tests/rustdoc-ui/{ => lints}/remap-path-prefix-lint.rs (100%) rename tests/rustdoc-ui/{ => lints}/remap-path-prefix-lint.stderr (68%) rename tests/rustdoc-ui/{ => lints}/unescaped_backticks.rs (100%) rename tests/rustdoc-ui/{ => lints}/unescaped_backticks.stderr (100%) rename tests/rustdoc/{ => doc-cfg}/duplicate-cfg.rs (100%) diff --git a/tests/rustdoc-ui/deref-generic.rs b/tests/rustdoc-ui/deref/deref-generic.rs similarity index 100% rename from tests/rustdoc-ui/deref-generic.rs rename to tests/rustdoc-ui/deref/deref-generic.rs diff --git a/tests/rustdoc-ui/ice-blanket-impl-56701.rs b/tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs similarity index 100% rename from tests/rustdoc-ui/ice-blanket-impl-56701.rs rename to tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs diff --git a/tests/rustdoc-ui/recursive-deref-ice.rs b/tests/rustdoc-ui/deref/recursive-deref-ice.rs similarity index 100% rename from tests/rustdoc-ui/recursive-deref-ice.rs rename to tests/rustdoc-ui/deref/recursive-deref-ice.rs diff --git a/tests/rustdoc-ui/auxiliary/issue-48414.rs b/tests/rustdoc-ui/intra-doc/auxiliary/issue-48414.rs similarity index 100% rename from tests/rustdoc-ui/auxiliary/issue-48414.rs rename to tests/rustdoc-ui/intra-doc/auxiliary/issue-48414.rs diff --git a/tests/rustdoc-ui/circular-intra-doc-link-48414.rs b/tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs similarity index 100% rename from tests/rustdoc-ui/circular-intra-doc-link-48414.rs rename to tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs diff --git a/tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs b/tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs similarity index 100% rename from tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs rename to tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs diff --git a/tests/rustdoc-ui/disambiguator-endswith-named-suffix.stderr b/tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.stderr similarity index 100% rename from tests/rustdoc-ui/disambiguator-endswith-named-suffix.stderr rename to tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.stderr diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs b/tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs similarity index 100% rename from tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs rename to tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr b/tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.stderr similarity index 100% rename from tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr rename to tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.stderr diff --git a/tests/rustdoc-ui/diagnostic-width.rs b/tests/rustdoc-ui/lints/diagnostic-width.rs similarity index 100% rename from tests/rustdoc-ui/diagnostic-width.rs rename to tests/rustdoc-ui/lints/diagnostic-width.rs diff --git a/tests/rustdoc-ui/diagnostic-width.stderr b/tests/rustdoc-ui/lints/diagnostic-width.stderr similarity index 100% rename from tests/rustdoc-ui/diagnostic-width.stderr rename to tests/rustdoc-ui/lints/diagnostic-width.stderr diff --git a/tests/rustdoc-ui/include-str-bare-urls.rs b/tests/rustdoc-ui/lints/include-str-bare-urls.rs similarity index 89% rename from tests/rustdoc-ui/include-str-bare-urls.rs rename to tests/rustdoc-ui/lints/include-str-bare-urls.rs index f80e28e8ca700..83539ef62b3dc 100644 --- a/tests/rustdoc-ui/include-str-bare-urls.rs +++ b/tests/rustdoc-ui/lints/include-str-bare-urls.rs @@ -12,6 +12,6 @@ // If the stderr file changes, make sure the warning points at the URL! #![deny(rustdoc::bare_urls)] -#![doc=include_str!("auxiliary/include-str-bare-urls.md")] +#![doc=include_str!("../auxiliary/include-str-bare-urls.md")] //~? ERROR this URL is not a hyperlink diff --git a/tests/rustdoc-ui/include-str-bare-urls.stderr b/tests/rustdoc-ui/lints/include-str-bare-urls.stderr similarity index 91% rename from tests/rustdoc-ui/include-str-bare-urls.stderr rename to tests/rustdoc-ui/lints/include-str-bare-urls.stderr index 53da2411874a5..7771a051fe1b9 100644 --- a/tests/rustdoc-ui/include-str-bare-urls.stderr +++ b/tests/rustdoc-ui/lints/include-str-bare-urls.stderr @@ -1,5 +1,5 @@ error: this URL is not a hyperlink - --> $DIR/auxiliary/include-str-bare-urls.md:1:11 + --> $DIR/../auxiliary/include-str-bare-urls.md:1:11 | LL | HEADS UP! https://example.com MUST SHOW UP IN THE STDERR FILE! | ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/rustdoc-ui/redundant-explicit-links-123677.rs b/tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs similarity index 100% rename from tests/rustdoc-ui/redundant-explicit-links-123677.rs rename to tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs diff --git a/tests/rustdoc-ui/remap-path-prefix-lint.rs b/tests/rustdoc-ui/lints/remap-path-prefix-lint.rs similarity index 100% rename from tests/rustdoc-ui/remap-path-prefix-lint.rs rename to tests/rustdoc-ui/lints/remap-path-prefix-lint.rs diff --git a/tests/rustdoc-ui/remap-path-prefix-lint.stderr b/tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr similarity index 68% rename from tests/rustdoc-ui/remap-path-prefix-lint.stderr rename to tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr index d7c1bb1965d35..e8a88394ffd92 100644 --- a/tests/rustdoc-ui/remap-path-prefix-lint.stderr +++ b/tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr @@ -1,11 +1,11 @@ error: unopened HTML tag `script` - --> remapped_path/remap-path-prefix-lint.rs:9:5 + --> remapped_path/lints/remap-path-prefix-lint.rs:9:5 | LL | /// | ^^^^^^^^^ | note: the lint level is defined here - --> remapped_path/remap-path-prefix-lint.rs:7:9 + --> remapped_path/lints/remap-path-prefix-lint.rs:7:9 | LL | #![deny(rustdoc::invalid_html_tags)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/rustdoc-ui/unescaped_backticks.rs b/tests/rustdoc-ui/lints/unescaped_backticks.rs similarity index 100% rename from tests/rustdoc-ui/unescaped_backticks.rs rename to tests/rustdoc-ui/lints/unescaped_backticks.rs diff --git a/tests/rustdoc-ui/unescaped_backticks.stderr b/tests/rustdoc-ui/lints/unescaped_backticks.stderr similarity index 100% rename from tests/rustdoc-ui/unescaped_backticks.stderr rename to tests/rustdoc-ui/lints/unescaped_backticks.stderr diff --git a/tests/rustdoc/duplicate-cfg.rs b/tests/rustdoc/doc-cfg/duplicate-cfg.rs similarity index 100% rename from tests/rustdoc/duplicate-cfg.rs rename to tests/rustdoc/doc-cfg/duplicate-cfg.rs