diff --git a/tests/rustdoc/anchor-id-duplicate-method-name-25001.rs b/tests/rustdoc/anchors/anchor-id-duplicate-method-name-25001.rs
similarity index 100%
rename from tests/rustdoc/anchor-id-duplicate-method-name-25001.rs
rename to tests/rustdoc/anchors/anchor-id-duplicate-method-name-25001.rs
diff --git a/tests/rustdoc/anchor-id-trait-method-15169.rs b/tests/rustdoc/anchors/anchor-id-trait-method-15169.rs
similarity index 100%
rename from tests/rustdoc/anchor-id-trait-method-15169.rs
rename to tests/rustdoc/anchors/anchor-id-trait-method-15169.rs
diff --git a/tests/rustdoc/anchor-id-trait-tymethod-28478.rs b/tests/rustdoc/anchors/anchor-id-trait-tymethod-28478.rs
similarity index 100%
rename from tests/rustdoc/anchor-id-trait-tymethod-28478.rs
rename to tests/rustdoc/anchors/anchor-id-trait-tymethod-28478.rs
diff --git a/tests/rustdoc/anchors.no_const_anchor.html b/tests/rustdoc/anchors/anchors.no_const_anchor.html
similarity index 100%
rename from tests/rustdoc/anchors.no_const_anchor.html
rename to tests/rustdoc/anchors/anchors.no_const_anchor.html
diff --git a/tests/rustdoc/anchors.no_const_anchor2.html b/tests/rustdoc/anchors/anchors.no_const_anchor2.html
similarity index 100%
rename from tests/rustdoc/anchors.no_const_anchor2.html
rename to tests/rustdoc/anchors/anchors.no_const_anchor2.html
diff --git a/tests/rustdoc/anchors.no_method_anchor.html b/tests/rustdoc/anchors/anchors.no_method_anchor.html
similarity index 100%
rename from tests/rustdoc/anchors.no_method_anchor.html
rename to tests/rustdoc/anchors/anchors.no_method_anchor.html
diff --git a/tests/rustdoc/anchors.no_trait_method_anchor.html b/tests/rustdoc/anchors/anchors.no_trait_method_anchor.html
similarity index 100%
rename from tests/rustdoc/anchors.no_trait_method_anchor.html
rename to tests/rustdoc/anchors/anchors.no_trait_method_anchor.html
diff --git a/tests/rustdoc/anchors.no_tymethod_anchor.html b/tests/rustdoc/anchors/anchors.no_tymethod_anchor.html
similarity index 100%
rename from tests/rustdoc/anchors.no_tymethod_anchor.html
rename to tests/rustdoc/anchors/anchors.no_tymethod_anchor.html
diff --git a/tests/rustdoc/anchors.no_type_anchor.html b/tests/rustdoc/anchors/anchors.no_type_anchor.html
similarity index 100%
rename from tests/rustdoc/anchors.no_type_anchor.html
rename to tests/rustdoc/anchors/anchors.no_type_anchor.html
diff --git a/tests/rustdoc/anchors.no_type_anchor2.html b/tests/rustdoc/anchors/anchors.no_type_anchor2.html
similarity index 100%
rename from tests/rustdoc/anchors.no_type_anchor2.html
rename to tests/rustdoc/anchors/anchors.no_type_anchor2.html
diff --git a/tests/rustdoc/anchors.rs b/tests/rustdoc/anchors/anchors.rs
similarity index 100%
rename from tests/rustdoc/anchors.rs
rename to tests/rustdoc/anchors/anchors.rs
diff --git a/tests/rustdoc/auxiliary/issue-86620-1.rs b/tests/rustdoc/anchors/auxiliary/issue-86620-1.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-86620-1.rs
rename to tests/rustdoc/anchors/auxiliary/issue-86620-1.rs
diff --git a/tests/rustdoc/disambiguate-anchors-32890.rs b/tests/rustdoc/anchors/disambiguate-anchors-32890.rs
similarity index 100%
rename from tests/rustdoc/disambiguate-anchors-32890.rs
rename to tests/rustdoc/anchors/disambiguate-anchors-32890.rs
diff --git a/tests/rustdoc/disambiguate-anchors-header-29449.rs b/tests/rustdoc/anchors/disambiguate-anchors-header-29449.rs
similarity index 100%
rename from tests/rustdoc/disambiguate-anchors-header-29449.rs
rename to tests/rustdoc/anchors/disambiguate-anchors-header-29449.rs
diff --git a/tests/rustdoc/method-anchor-in-blanket-impl-86620.rs b/tests/rustdoc/anchors/method-anchor-in-blanket-impl-86620.rs
similarity index 100%
rename from tests/rustdoc/method-anchor-in-blanket-impl-86620.rs
rename to tests/rustdoc/anchors/method-anchor-in-blanket-impl-86620.rs
diff --git a/tests/rustdoc/trait-impl-items-links-and-anchors.rs b/tests/rustdoc/anchors/trait-impl-items-links-and-anchors.rs
similarity index 100%
rename from tests/rustdoc/trait-impl-items-links-and-anchors.rs
rename to tests/rustdoc/anchors/trait-impl-items-links-and-anchors.rs
diff --git a/tests/rustdoc/assoc-fns.rs b/tests/rustdoc/assoc/assoc-fns.rs
similarity index 100%
rename from tests/rustdoc/assoc-fns.rs
rename to tests/rustdoc/assoc/assoc-fns.rs
diff --git a/tests/rustdoc/assoc-item-cast.rs b/tests/rustdoc/assoc/assoc-item-cast.rs
similarity index 100%
rename from tests/rustdoc/assoc-item-cast.rs
rename to tests/rustdoc/assoc/assoc-item-cast.rs
diff --git a/tests/rustdoc/assoc-type-bindings-20646.rs b/tests/rustdoc/assoc/assoc-type-bindings-20646.rs
similarity index 100%
rename from tests/rustdoc/assoc-type-bindings-20646.rs
rename to tests/rustdoc/assoc/assoc-type-bindings-20646.rs
diff --git a/tests/rustdoc/assoc-types.rs b/tests/rustdoc/assoc/assoc-types.rs
similarity index 100%
rename from tests/rustdoc/assoc-types.rs
rename to tests/rustdoc/assoc/assoc-types.rs
diff --git a/tests/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/assoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
rename to tests/rustdoc/assoc/auxiliary/cross-crate-hidden-assoc-trait-items.rs
diff --git a/tests/rustdoc/auxiliary/issue-20646.rs b/tests/rustdoc/assoc/auxiliary/issue-20646.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-20646.rs
rename to tests/rustdoc/assoc/auxiliary/issue-20646.rs
diff --git a/tests/rustdoc/auxiliary/issue-20727.rs b/tests/rustdoc/assoc/auxiliary/issue-20727.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-20727.rs
rename to tests/rustdoc/assoc/auxiliary/issue-20727.rs
diff --git a/tests/rustdoc/auxiliary/normalize-assoc-item.rs b/tests/rustdoc/assoc/auxiliary/normalize-assoc-item.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/normalize-assoc-item.rs
rename to tests/rustdoc/assoc/auxiliary/normalize-assoc-item.rs
diff --git a/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/assoc/cross-crate-hidden-assoc-trait-items.rs
similarity index 100%
rename from tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs
rename to tests/rustdoc/assoc/cross-crate-hidden-assoc-trait-items.rs
diff --git a/tests/rustdoc/doc-assoc-item.rs b/tests/rustdoc/assoc/doc-assoc-item.rs
similarity index 100%
rename from tests/rustdoc/doc-assoc-item.rs
rename to tests/rustdoc/assoc/doc-assoc-item.rs
diff --git a/tests/rustdoc/inline-assoc-type-20727-bindings.rs b/tests/rustdoc/assoc/inline-assoc-type-20727-bindings.rs
similarity index 100%
rename from tests/rustdoc/inline-assoc-type-20727-bindings.rs
rename to tests/rustdoc/assoc/inline-assoc-type-20727-bindings.rs
diff --git a/tests/rustdoc/inline-assoc-type-20727-bounds-deref.rs b/tests/rustdoc/assoc/inline-assoc-type-20727-bounds-deref.rs
similarity index 100%
rename from tests/rustdoc/inline-assoc-type-20727-bounds-deref.rs
rename to tests/rustdoc/assoc/inline-assoc-type-20727-bounds-deref.rs
diff --git a/tests/rustdoc/inline-assoc-type-20727-bounds-index.rs b/tests/rustdoc/assoc/inline-assoc-type-20727-bounds-index.rs
similarity index 100%
rename from tests/rustdoc/inline-assoc-type-20727-bounds-index.rs
rename to tests/rustdoc/assoc/inline-assoc-type-20727-bounds-index.rs
diff --git a/tests/rustdoc/inline-assoc-type-20727-bounds.rs b/tests/rustdoc/assoc/inline-assoc-type-20727-bounds.rs
similarity index 100%
rename from tests/rustdoc/inline-assoc-type-20727-bounds.rs
rename to tests/rustdoc/assoc/inline-assoc-type-20727-bounds.rs
diff --git a/tests/rustdoc/normalize-assoc-item.rs b/tests/rustdoc/assoc/normalize-assoc-item.rs
similarity index 100%
rename from tests/rustdoc/normalize-assoc-item.rs
rename to tests/rustdoc/assoc/normalize-assoc-item.rs
diff --git a/tests/rustdoc/async-fn-opaque-item.rs b/tests/rustdoc/async/async-fn-opaque-item.rs
similarity index 100%
rename from tests/rustdoc/async-fn-opaque-item.rs
rename to tests/rustdoc/async/async-fn-opaque-item.rs
diff --git a/tests/rustdoc/async-fn.rs b/tests/rustdoc/async/async-fn.rs
similarity index 100%
rename from tests/rustdoc/async-fn.rs
rename to tests/rustdoc/async/async-fn.rs
diff --git a/tests/rustdoc/async-move-doctest.rs b/tests/rustdoc/async/async-move-doctest.rs
similarity index 100%
rename from tests/rustdoc/async-move-doctest.rs
rename to tests/rustdoc/async/async-move-doctest.rs
diff --git a/tests/rustdoc/async-trait-sig.rs b/tests/rustdoc/async/async-trait-sig.rs
similarity index 100%
rename from tests/rustdoc/async-trait-sig.rs
rename to tests/rustdoc/async/async-trait-sig.rs
diff --git a/tests/rustdoc/async-trait.rs b/tests/rustdoc/async/async-trait.rs
similarity index 100%
rename from tests/rustdoc/async-trait.rs
rename to tests/rustdoc/async/async-trait.rs
diff --git a/tests/rustdoc/auxiliary/async-trait-dep.rs b/tests/rustdoc/async/auxiliary/async-trait-dep.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/async-trait-dep.rs
rename to tests/rustdoc/async/auxiliary/async-trait-dep.rs
diff --git a/tests/rustdoc/auto-impl-for-trait.rs b/tests/rustdoc/auto/auto-impl-for-trait.rs
similarity index 100%
rename from tests/rustdoc/auto-impl-for-trait.rs
rename to tests/rustdoc/auto/auto-impl-for-trait.rs
diff --git a/tests/rustdoc/auto-impl-primitive.rs b/tests/rustdoc/auto/auto-impl-primitive.rs
similarity index 100%
rename from tests/rustdoc/auto-impl-primitive.rs
rename to tests/rustdoc/auto/auto-impl-primitive.rs
diff --git a/tests/rustdoc/auto-trait-bounds-by-associated-type-50159.rs b/tests/rustdoc/auto/auto-trait-bounds-by-associated-type-50159.rs
similarity index 100%
rename from tests/rustdoc/auto-trait-bounds-by-associated-type-50159.rs
rename to tests/rustdoc/auto/auto-trait-bounds-by-associated-type-50159.rs
diff --git a/tests/rustdoc/auto-trait-bounds-inference-variables-54705.rs b/tests/rustdoc/auto/auto-trait-bounds-inference-variables-54705.rs
similarity index 100%
rename from tests/rustdoc/auto-trait-bounds-inference-variables-54705.rs
rename to tests/rustdoc/auto/auto-trait-bounds-inference-variables-54705.rs
diff --git a/tests/rustdoc/auto-trait-bounds-where-51236.rs b/tests/rustdoc/auto/auto-trait-bounds-where-51236.rs
similarity index 100%
rename from tests/rustdoc/auto-trait-bounds-where-51236.rs
rename to tests/rustdoc/auto/auto-trait-bounds-where-51236.rs
diff --git a/tests/rustdoc/auto-trait-negative-impl-55321.rs b/tests/rustdoc/auto/auto-trait-negative-impl-55321.rs
similarity index 100%
rename from tests/rustdoc/auto-trait-negative-impl-55321.rs
rename to tests/rustdoc/auto/auto-trait-negative-impl-55321.rs
diff --git a/tests/rustdoc/auto-trait-not-send.rs b/tests/rustdoc/auto/auto-trait-not-send.rs
similarity index 100%
rename from tests/rustdoc/auto-trait-not-send.rs
rename to tests/rustdoc/auto/auto-trait-not-send.rs
diff --git a/tests/rustdoc/auto-traits.rs b/tests/rustdoc/auto/auto-traits.rs
similarity index 100%
rename from tests/rustdoc/auto-traits.rs
rename to tests/rustdoc/auto/auto-traits.rs
diff --git a/tests/rustdoc/auto_aliases.rs b/tests/rustdoc/auto/auto_aliases.rs
similarity index 100%
rename from tests/rustdoc/auto_aliases.rs
rename to tests/rustdoc/auto/auto_aliases.rs
diff --git a/tests/rustdoc/auxiliary/auto-traits.rs b/tests/rustdoc/auto/auxiliary/auto-traits.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/auto-traits.rs
rename to tests/rustdoc/auto/auxiliary/auto-traits.rs
diff --git a/tests/rustdoc/assoc-consts-underscore.rs b/tests/rustdoc/constant/assoc-consts-underscore.rs
similarity index 100%
rename from tests/rustdoc/assoc-consts-underscore.rs
rename to tests/rustdoc/constant/assoc-consts-underscore.rs
diff --git a/tests/rustdoc/assoc-consts-version.rs b/tests/rustdoc/constant/assoc-consts-version.rs
similarity index 100%
rename from tests/rustdoc/assoc-consts-version.rs
rename to tests/rustdoc/constant/assoc-consts-version.rs
diff --git a/tests/rustdoc/assoc-consts.rs b/tests/rustdoc/constant/assoc-consts.rs
similarity index 100%
rename from tests/rustdoc/assoc-consts.rs
rename to tests/rustdoc/constant/assoc-consts.rs
diff --git a/tests/rustdoc/associated-consts.rs b/tests/rustdoc/constant/associated-consts.rs
similarity index 100%
rename from tests/rustdoc/associated-consts.rs
rename to tests/rustdoc/constant/associated-consts.rs
diff --git a/tests/rustdoc/const-display.rs b/tests/rustdoc/constant/const-display.rs
similarity index 100%
rename from tests/rustdoc/const-display.rs
rename to tests/rustdoc/constant/const-display.rs
diff --git a/tests/rustdoc/const-doc.rs b/tests/rustdoc/constant/const-doc.rs
similarity index 100%
rename from tests/rustdoc/const-doc.rs
rename to tests/rustdoc/constant/const-doc.rs
diff --git a/tests/rustdoc/const-effect-param.rs b/tests/rustdoc/constant/const-effect-param.rs
similarity index 100%
rename from tests/rustdoc/const-effect-param.rs
rename to tests/rustdoc/constant/const-effect-param.rs
diff --git a/tests/rustdoc/const-underscore.rs b/tests/rustdoc/constant/const-underscore.rs
similarity index 100%
rename from tests/rustdoc/const-underscore.rs
rename to tests/rustdoc/constant/const-underscore.rs
diff --git a/tests/rustdoc/const-value-display.rs b/tests/rustdoc/constant/const-value-display.rs
similarity index 100%
rename from tests/rustdoc/const-value-display.rs
rename to tests/rustdoc/constant/const-value-display.rs
diff --git a/tests/rustdoc/const.rs b/tests/rustdoc/constant/const.rs
similarity index 100%
rename from tests/rustdoc/const.rs
rename to tests/rustdoc/constant/const.rs
diff --git a/tests/rustdoc/document-item-with-associated-const-in-where-clause.rs b/tests/rustdoc/constant/document-item-with-associated-const-in-where-clause.rs
similarity index 100%
rename from tests/rustdoc/document-item-with-associated-const-in-where-clause.rs
rename to tests/rustdoc/constant/document-item-with-associated-const-in-where-clause.rs
diff --git a/tests/rustdoc/generic-const-items.rs b/tests/rustdoc/constant/generic-const-items.rs
similarity index 100%
rename from tests/rustdoc/generic-const-items.rs
rename to tests/rustdoc/constant/generic-const-items.rs
diff --git a/tests/rustdoc/generic_const_exprs.rs b/tests/rustdoc/constant/generic_const_exprs.rs
similarity index 100%
rename from tests/rustdoc/generic_const_exprs.rs
rename to tests/rustdoc/constant/generic_const_exprs.rs
diff --git a/tests/rustdoc/glob-shadowing-const.rs b/tests/rustdoc/constant/glob-shadowing-const.rs
similarity index 100%
rename from tests/rustdoc/glob-shadowing-const.rs
rename to tests/rustdoc/constant/glob-shadowing-const.rs
diff --git a/tests/rustdoc/hide-complex-unevaluated-const-arguments.rs b/tests/rustdoc/constant/hide-complex-unevaluated-const-arguments.rs
similarity index 100%
rename from tests/rustdoc/hide-complex-unevaluated-const-arguments.rs
rename to tests/rustdoc/constant/hide-complex-unevaluated-const-arguments.rs
diff --git a/tests/rustdoc/hide-complex-unevaluated-consts.rs b/tests/rustdoc/constant/hide-complex-unevaluated-consts.rs
similarity index 100%
rename from tests/rustdoc/hide-complex-unevaluated-consts.rs
rename to tests/rustdoc/constant/hide-complex-unevaluated-consts.rs
diff --git a/tests/rustdoc/ice-associated-const-equality-105952.rs b/tests/rustdoc/constant/ice-associated-const-equality-105952.rs
similarity index 100%
rename from tests/rustdoc/ice-associated-const-equality-105952.rs
rename to tests/rustdoc/constant/ice-associated-const-equality-105952.rs
diff --git a/tests/rustdoc/legacy-const-generic.rs b/tests/rustdoc/constant/legacy-const-generic.rs
similarity index 100%
rename from tests/rustdoc/legacy-const-generic.rs
rename to tests/rustdoc/constant/legacy-const-generic.rs
diff --git a/tests/rustdoc/link-assoc-const.rs b/tests/rustdoc/constant/link-assoc-const.rs
similarity index 100%
rename from tests/rustdoc/link-assoc-const.rs
rename to tests/rustdoc/constant/link-assoc-const.rs
diff --git a/tests/rustdoc/redirect-const.rs b/tests/rustdoc/constant/redirect-const.rs
similarity index 100%
rename from tests/rustdoc/redirect-const.rs
rename to tests/rustdoc/constant/redirect-const.rs
diff --git a/tests/rustdoc/rfc-2632-const-trait-impl.rs b/tests/rustdoc/constant/rfc-2632-const-trait-impl.rs
similarity index 100%
rename from tests/rustdoc/rfc-2632-const-trait-impl.rs
rename to tests/rustdoc/constant/rfc-2632-const-trait-impl.rs
diff --git a/tests/rustdoc/show-const-contents.rs b/tests/rustdoc/constant/show-const-contents.rs
similarity index 100%
rename from tests/rustdoc/show-const-contents.rs
rename to tests/rustdoc/constant/show-const-contents.rs
diff --git a/tests/rustdoc/doc-cfg-hide.rs b/tests/rustdoc/doc-cfg/doc-cfg-hide.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-hide.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-hide.rs
diff --git a/tests/rustdoc/doc-cfg-implicit-gate.rs b/tests/rustdoc/doc-cfg/doc-cfg-implicit-gate.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-implicit-gate.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-implicit-gate.rs
diff --git a/tests/rustdoc/doc-cfg-implicit.rs b/tests/rustdoc/doc-cfg/doc-cfg-implicit.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-implicit.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-implicit.rs
diff --git a/tests/rustdoc/doc-cfg-inherit-from-module-79201.rs b/tests/rustdoc/doc-cfg/doc-cfg-inherit-from-module-79201.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-inherit-from-module-79201.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-inherit-from-module-79201.rs
diff --git a/tests/rustdoc/doc-cfg-simplification.rs b/tests/rustdoc/doc-cfg/doc-cfg-simplification.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-simplification.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-simplification.rs
diff --git a/tests/rustdoc/doc-cfg-target-feature.rs b/tests/rustdoc/doc-cfg/doc-cfg-target-feature.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-target-feature.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-target-feature.rs
diff --git a/tests/rustdoc/doc-cfg-traits.rs b/tests/rustdoc/doc-cfg/doc-cfg-traits.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg-traits.rs
rename to tests/rustdoc/doc-cfg/doc-cfg-traits.rs
diff --git a/tests/rustdoc/doc-cfg.rs b/tests/rustdoc/doc-cfg/doc-cfg.rs
similarity index 100%
rename from tests/rustdoc/doc-cfg.rs
rename to tests/rustdoc/doc-cfg/doc-cfg.rs
diff --git a/tests/rustdoc/auxiliary/enum-variant.rs b/tests/rustdoc/enum/auxiliary/enum-variant.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/enum-variant.rs
rename to tests/rustdoc/enum/auxiliary/enum-variant.rs
diff --git a/tests/rustdoc/auxiliary/variant-struct.rs b/tests/rustdoc/enum/auxiliary/variant-struct.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/variant-struct.rs
rename to tests/rustdoc/enum/auxiliary/variant-struct.rs
diff --git a/tests/rustdoc/enum-headings.rs b/tests/rustdoc/enum/enum-headings.rs
similarity index 100%
rename from tests/rustdoc/enum-headings.rs
rename to tests/rustdoc/enum/enum-headings.rs
diff --git a/tests/rustdoc/enum-non-exhaustive-108925.rs b/tests/rustdoc/enum/enum-non-exhaustive-108925.rs
similarity index 100%
rename from tests/rustdoc/enum-non-exhaustive-108925.rs
rename to tests/rustdoc/enum/enum-non-exhaustive-108925.rs
diff --git a/tests/rustdoc/enum-variant-doc-hidden-field-88600.rs b/tests/rustdoc/enum/enum-variant-doc-hidden-field-88600.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-doc-hidden-field-88600.rs
rename to tests/rustdoc/enum/enum-variant-doc-hidden-field-88600.rs
diff --git a/tests/rustdoc/enum-variant-fields-heading.rs b/tests/rustdoc/enum/enum-variant-fields-heading.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-fields-heading.rs
rename to tests/rustdoc/enum/enum-variant-fields-heading.rs
diff --git a/tests/rustdoc/enum-variant-fields-heading.variants.html b/tests/rustdoc/enum/enum-variant-fields-heading.variants.html
similarity index 100%
rename from tests/rustdoc/enum-variant-fields-heading.variants.html
rename to tests/rustdoc/enum/enum-variant-fields-heading.variants.html
diff --git a/tests/rustdoc/enum-variant-value.rs b/tests/rustdoc/enum/enum-variant-value.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-value.rs
rename to tests/rustdoc/enum/enum-variant-value.rs
diff --git a/tests/rustdoc/render-enum-variant-structlike-32395.rs b/tests/rustdoc/enum/render-enum-variant-structlike-32395.rs
similarity index 100%
rename from tests/rustdoc/render-enum-variant-structlike-32395.rs
rename to tests/rustdoc/enum/render-enum-variant-structlike-32395.rs
diff --git a/tests/rustdoc/strip-enum-variant.no-not-shown.html b/tests/rustdoc/enum/strip-enum-variant.no-not-shown.html
similarity index 100%
rename from tests/rustdoc/strip-enum-variant.no-not-shown.html
rename to tests/rustdoc/enum/strip-enum-variant.no-not-shown.html
diff --git a/tests/rustdoc/strip-enum-variant.rs b/tests/rustdoc/enum/strip-enum-variant.rs
similarity index 100%
rename from tests/rustdoc/strip-enum-variant.rs
rename to tests/rustdoc/enum/strip-enum-variant.rs
diff --git a/tests/rustdoc/extern/auxiliary/empty.rs b/tests/rustdoc/extern/auxiliary/empty.rs
new file mode 100644
index 0000000000000..d11c69f812a8d
--- /dev/null
+++ b/tests/rustdoc/extern/auxiliary/empty.rs
@@ -0,0 +1 @@
+// intentionally empty
diff --git a/tests/rustdoc/auxiliary/extern-links.rs b/tests/rustdoc/extern/auxiliary/extern-links.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/extern-links.rs
rename to tests/rustdoc/extern/auxiliary/extern-links.rs
diff --git a/tests/rustdoc/auxiliary/external-cross-doc.md b/tests/rustdoc/extern/auxiliary/external-cross-doc.md
similarity index 100%
rename from tests/rustdoc/auxiliary/external-cross-doc.md
rename to tests/rustdoc/extern/auxiliary/external-cross-doc.md
diff --git a/tests/rustdoc/auxiliary/external-cross.rs b/tests/rustdoc/extern/auxiliary/external-cross.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/external-cross.rs
rename to tests/rustdoc/extern/auxiliary/external-cross.rs
diff --git a/tests/rustdoc/auxiliary/external-doc.md b/tests/rustdoc/extern/auxiliary/external-doc.md
similarity index 100%
rename from tests/rustdoc/auxiliary/external-doc.md
rename to tests/rustdoc/extern/auxiliary/external-doc.md
diff --git a/tests/rustdoc/auxiliary/html_root.rs b/tests/rustdoc/extern/auxiliary/html_root.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/html_root.rs
rename to tests/rustdoc/extern/auxiliary/html_root.rs
diff --git a/tests/rustdoc/auxiliary/issue-30109-1.rs b/tests/rustdoc/extern/auxiliary/issue-30109-1.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-30109-1.rs
rename to tests/rustdoc/extern/auxiliary/issue-30109-1.rs
diff --git a/tests/rustdoc/auxiliary/no_html_root.rs b/tests/rustdoc/extern/auxiliary/no_html_root.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/no_html_root.rs
rename to tests/rustdoc/extern/auxiliary/no_html_root.rs
diff --git a/tests/rustdoc/auxiliary/panic-item.rs b/tests/rustdoc/extern/auxiliary/panic-item.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/panic-item.rs
rename to tests/rustdoc/extern/auxiliary/panic-item.rs
diff --git a/tests/rustdoc/auxiliary/pub-extern-crate.rs b/tests/rustdoc/extern/auxiliary/pub-extern-crate.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/pub-extern-crate.rs
rename to tests/rustdoc/extern/auxiliary/pub-extern-crate.rs
diff --git a/tests/rustdoc/auxiliary/rustdoc-extern-default-method.rs b/tests/rustdoc/extern/auxiliary/rustdoc-extern-default-method.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/rustdoc-extern-default-method.rs
rename to tests/rustdoc/extern/auxiliary/rustdoc-extern-default-method.rs
diff --git a/tests/rustdoc/auxiliary/rustdoc-extern-method.rs b/tests/rustdoc/extern/auxiliary/rustdoc-extern-method.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/rustdoc-extern-method.rs
rename to tests/rustdoc/extern/auxiliary/rustdoc-extern-method.rs
diff --git a/tests/rustdoc/extern/auxiliary/variant-struct.rs b/tests/rustdoc/extern/auxiliary/variant-struct.rs
new file mode 100644
index 0000000000000..0f3d2e5f1b7a0
--- /dev/null
+++ b/tests/rustdoc/extern/auxiliary/variant-struct.rs
@@ -0,0 +1,5 @@
+pub enum Foo {
+    Bar {
+        qux: (),
+    }
+}
diff --git a/tests/rustdoc/extern-default-method.no_href_on_anchor.html b/tests/rustdoc/extern/extern-default-method.no_href_on_anchor.html
similarity index 100%
rename from tests/rustdoc/extern-default-method.no_href_on_anchor.html
rename to tests/rustdoc/extern/extern-default-method.no_href_on_anchor.html
diff --git a/tests/rustdoc/extern-default-method.rs b/tests/rustdoc/extern/extern-default-method.rs
similarity index 100%
rename from tests/rustdoc/extern-default-method.rs
rename to tests/rustdoc/extern/extern-default-method.rs
diff --git a/tests/rustdoc/extern-fn-22038.rs b/tests/rustdoc/extern/extern-fn-22038.rs
similarity index 100%
rename from tests/rustdoc/extern-fn-22038.rs
rename to tests/rustdoc/extern/extern-fn-22038.rs
diff --git a/tests/rustdoc/extern-html-root-url-precedence.rs b/tests/rustdoc/extern/extern-html-root-url-precedence.rs
similarity index 100%
rename from tests/rustdoc/extern-html-root-url-precedence.rs
rename to tests/rustdoc/extern/extern-html-root-url-precedence.rs
diff --git a/tests/rustdoc/extern-html-root-url.rs b/tests/rustdoc/extern/extern-html-root-url.rs
similarity index 100%
rename from tests/rustdoc/extern-html-root-url.rs
rename to tests/rustdoc/extern/extern-html-root-url.rs
diff --git a/tests/rustdoc/extern-links.rs b/tests/rustdoc/extern/extern-links.rs
similarity index 100%
rename from tests/rustdoc/extern-links.rs
rename to tests/rustdoc/extern/extern-links.rs
diff --git a/tests/rustdoc/extern-method.rs b/tests/rustdoc/extern/extern-method.rs
similarity index 100%
rename from tests/rustdoc/extern-method.rs
rename to tests/rustdoc/extern/extern-method.rs
diff --git a/tests/rustdoc/external-cross.rs b/tests/rustdoc/extern/external-cross.rs
similarity index 100%
rename from tests/rustdoc/external-cross.rs
rename to tests/rustdoc/extern/external-cross.rs
diff --git a/tests/rustdoc/external-doc.rs b/tests/rustdoc/extern/external-doc.rs
similarity index 100%
rename from tests/rustdoc/external-doc.rs
rename to tests/rustdoc/extern/external-doc.rs
diff --git a/tests/rustdoc/hidden-extern-34025.rs b/tests/rustdoc/extern/hidden-extern-34025.rs
similarity index 100%
rename from tests/rustdoc/hidden-extern-34025.rs
rename to tests/rustdoc/extern/hidden-extern-34025.rs
diff --git a/tests/rustdoc/link-extern-crate-33178.rs b/tests/rustdoc/extern/link-extern-crate-33178.rs
similarity index 100%
rename from tests/rustdoc/link-extern-crate-33178.rs
rename to tests/rustdoc/extern/link-extern-crate-33178.rs
diff --git a/tests/rustdoc/link-extern-crate-item-30109.rs b/tests/rustdoc/extern/link-extern-crate-item-30109.rs
similarity index 100%
rename from tests/rustdoc/link-extern-crate-item-30109.rs
rename to tests/rustdoc/extern/link-extern-crate-item-30109.rs
diff --git a/tests/rustdoc/link-extern-crate-title-33178.rs b/tests/rustdoc/extern/link-extern-crate-title-33178.rs
similarity index 100%
rename from tests/rustdoc/link-extern-crate-title-33178.rs
rename to tests/rustdoc/extern/link-extern-crate-title-33178.rs
diff --git a/tests/rustdoc/pub-extern-crate.rs b/tests/rustdoc/extern/pub-extern-crate.rs
similarity index 100%
rename from tests/rustdoc/pub-extern-crate.rs
rename to tests/rustdoc/extern/pub-extern-crate.rs
diff --git a/tests/rustdoc/unsafe-extern-blocks.rs b/tests/rustdoc/extern/unsafe-extern-blocks.rs
similarity index 100%
rename from tests/rustdoc/unsafe-extern-blocks.rs
rename to tests/rustdoc/extern/unsafe-extern-blocks.rs
diff --git a/tests/rustdoc/unused-extern-crate.rs b/tests/rustdoc/extern/unused-extern-crate.rs
similarity index 100%
rename from tests/rustdoc/unused-extern-crate.rs
rename to tests/rustdoc/extern/unused-extern-crate.rs
diff --git a/tests/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/impl/auxiliary/cross-crate-hidden-impl-parameter.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/cross-crate-hidden-impl-parameter.rs
rename to tests/rustdoc/impl/auxiliary/cross-crate-hidden-impl-parameter.rs
diff --git a/tests/rustdoc/auxiliary/extern-impl-trait.rs b/tests/rustdoc/impl/auxiliary/extern-impl-trait.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/extern-impl-trait.rs
rename to tests/rustdoc/impl/auxiliary/extern-impl-trait.rs
diff --git a/tests/rustdoc/auxiliary/incoherent-impl-types.rs b/tests/rustdoc/impl/auxiliary/incoherent-impl-types.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/incoherent-impl-types.rs
rename to tests/rustdoc/impl/auxiliary/incoherent-impl-types.rs
diff --git a/tests/rustdoc/auxiliary/issue-100204-aux.rs b/tests/rustdoc/impl/auxiliary/issue-100204-aux.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-100204-aux.rs
rename to tests/rustdoc/impl/auxiliary/issue-100204-aux.rs
diff --git a/tests/rustdoc/auxiliary/issue-17476.rs b/tests/rustdoc/impl/auxiliary/issue-17476.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-17476.rs
rename to tests/rustdoc/impl/auxiliary/issue-17476.rs
diff --git a/tests/rustdoc/auxiliary/issue-21092.rs b/tests/rustdoc/impl/auxiliary/issue-21092.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-21092.rs
rename to tests/rustdoc/impl/auxiliary/issue-21092.rs
diff --git a/tests/rustdoc/auxiliary/issue-22025.rs b/tests/rustdoc/impl/auxiliary/issue-22025.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-22025.rs
rename to tests/rustdoc/impl/auxiliary/issue-22025.rs
diff --git a/tests/rustdoc/auxiliary/issue-53689.rs b/tests/rustdoc/impl/auxiliary/issue-53689.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-53689.rs
rename to tests/rustdoc/impl/auxiliary/issue-53689.rs
diff --git a/tests/rustdoc/auxiliary/precise-capturing.rs b/tests/rustdoc/impl/auxiliary/precise-capturing.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/precise-capturing.rs
rename to tests/rustdoc/impl/auxiliary/precise-capturing.rs
diff --git a/tests/rustdoc/auxiliary/real_gimli.rs b/tests/rustdoc/impl/auxiliary/real_gimli.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/real_gimli.rs
rename to tests/rustdoc/impl/auxiliary/real_gimli.rs
diff --git a/tests/rustdoc/auxiliary/realcore.rs b/tests/rustdoc/impl/auxiliary/realcore.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/realcore.rs
rename to tests/rustdoc/impl/auxiliary/realcore.rs
diff --git a/tests/rustdoc/auxiliary/rustdoc-default-impl.rs b/tests/rustdoc/impl/auxiliary/rustdoc-default-impl.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/rustdoc-default-impl.rs
rename to tests/rustdoc/impl/auxiliary/rustdoc-default-impl.rs
diff --git a/tests/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs b/tests/rustdoc/impl/auxiliary/rustdoc-impl-parts-crosscrate.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
rename to tests/rustdoc/impl/auxiliary/rustdoc-impl-parts-crosscrate.rs
diff --git a/tests/rustdoc/blanket-impl-29503.rs b/tests/rustdoc/impl/blanket-impl-29503.rs
similarity index 100%
rename from tests/rustdoc/blanket-impl-29503.rs
rename to tests/rustdoc/impl/blanket-impl-29503.rs
diff --git a/tests/rustdoc/blanket-impl-78673.rs b/tests/rustdoc/impl/blanket-impl-78673.rs
similarity index 100%
rename from tests/rustdoc/blanket-impl-78673.rs
rename to tests/rustdoc/impl/blanket-impl-78673.rs
diff --git a/tests/rustdoc/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/impl/cross-crate-hidden-impl-parameter.rs
similarity index 100%
rename from tests/rustdoc/cross-crate-hidden-impl-parameter.rs
rename to tests/rustdoc/impl/cross-crate-hidden-impl-parameter.rs
diff --git a/tests/rustdoc/deduplicate-glob-import-impl-21474.rs b/tests/rustdoc/impl/deduplicate-glob-import-impl-21474.rs
similarity index 100%
rename from tests/rustdoc/deduplicate-glob-import-impl-21474.rs
rename to tests/rustdoc/impl/deduplicate-glob-import-impl-21474.rs
diff --git a/tests/rustdoc/deduplicate-trait-impl-22025.rs b/tests/rustdoc/impl/deduplicate-trait-impl-22025.rs
similarity index 100%
rename from tests/rustdoc/deduplicate-trait-impl-22025.rs
rename to tests/rustdoc/impl/deduplicate-trait-impl-22025.rs
diff --git a/tests/rustdoc/default-impl.rs b/tests/rustdoc/impl/default-impl.rs
similarity index 100%
rename from tests/rustdoc/default-impl.rs
rename to tests/rustdoc/impl/default-impl.rs
diff --git a/tests/rustdoc/deprecated-impls.rs b/tests/rustdoc/impl/deprecated-impls.rs
similarity index 100%
rename from tests/rustdoc/deprecated-impls.rs
rename to tests/rustdoc/impl/deprecated-impls.rs
diff --git a/tests/rustdoc/doc-hidden-trait-implementors-33069.rs b/tests/rustdoc/impl/doc-hidden-trait-implementors-33069.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-trait-implementors-33069.rs
rename to tests/rustdoc/impl/doc-hidden-trait-implementors-33069.rs
diff --git a/tests/rustdoc/doc_auto_cfg_nested_impl.rs b/tests/rustdoc/impl/doc_auto_cfg_nested_impl.rs
similarity index 100%
rename from tests/rustdoc/doc_auto_cfg_nested_impl.rs
rename to tests/rustdoc/impl/doc_auto_cfg_nested_impl.rs
diff --git a/tests/rustdoc/duplicated_impl.rs b/tests/rustdoc/impl/duplicated_impl.rs
similarity index 100%
rename from tests/rustdoc/duplicated_impl.rs
rename to tests/rustdoc/impl/duplicated_impl.rs
diff --git a/tests/rustdoc/empty-impl-block.rs b/tests/rustdoc/impl/empty-impl-block.rs
similarity index 100%
rename from tests/rustdoc/empty-impl-block.rs
rename to tests/rustdoc/impl/empty-impl-block.rs
diff --git a/tests/rustdoc/empty-impls.rs b/tests/rustdoc/impl/empty-impls.rs
similarity index 100%
rename from tests/rustdoc/empty-impls.rs
rename to tests/rustdoc/impl/empty-impls.rs
diff --git a/tests/rustdoc/extern-impl-trait.rs b/tests/rustdoc/impl/extern-impl-trait.rs
similarity index 100%
rename from tests/rustdoc/extern-impl-trait.rs
rename to tests/rustdoc/impl/extern-impl-trait.rs
diff --git a/tests/rustdoc/extern-impl.rs b/tests/rustdoc/impl/extern-impl.rs
similarity index 100%
rename from tests/rustdoc/extern-impl.rs
rename to tests/rustdoc/impl/extern-impl.rs
diff --git a/tests/rustdoc/foreign-implementors-js-43701.rs b/tests/rustdoc/impl/foreign-implementors-js-43701.rs
similarity index 100%
rename from tests/rustdoc/foreign-implementors-js-43701.rs
rename to tests/rustdoc/impl/foreign-implementors-js-43701.rs
diff --git a/tests/rustdoc/generic-impl.rs b/tests/rustdoc/impl/generic-impl.rs
similarity index 100%
rename from tests/rustdoc/generic-impl.rs
rename to tests/rustdoc/impl/generic-impl.rs
diff --git a/tests/rustdoc/hidden-implementors-90781.rs b/tests/rustdoc/impl/hidden-implementors-90781.rs
similarity index 100%
rename from tests/rustdoc/hidden-implementors-90781.rs
rename to tests/rustdoc/impl/hidden-implementors-90781.rs
diff --git a/tests/rustdoc/hidden-impls.rs b/tests/rustdoc/impl/hidden-impls.rs
similarity index 100%
rename from tests/rustdoc/hidden-impls.rs
rename to tests/rustdoc/impl/hidden-impls.rs
diff --git a/tests/rustdoc/hidden-trait-struct-impls.rs b/tests/rustdoc/impl/hidden-trait-struct-impls.rs
similarity index 100%
rename from tests/rustdoc/hidden-trait-struct-impls.rs
rename to tests/rustdoc/impl/hidden-trait-struct-impls.rs
diff --git a/tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs b/tests/rustdoc/impl/hide-mut-methods-if-no-derefmut-impl-74083.rs
similarity index 100%
rename from tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs
rename to tests/rustdoc/impl/hide-mut-methods-if-no-derefmut-impl-74083.rs
diff --git a/tests/rustdoc/impl-alias-substituted.rs b/tests/rustdoc/impl/impl-alias-substituted.rs
similarity index 100%
rename from tests/rustdoc/impl-alias-substituted.rs
rename to tests/rustdoc/impl/impl-alias-substituted.rs
diff --git a/tests/rustdoc/impl-assoc-type-21092.rs b/tests/rustdoc/impl/impl-assoc-type-21092.rs
similarity index 100%
rename from tests/rustdoc/impl-assoc-type-21092.rs
rename to tests/rustdoc/impl/impl-assoc-type-21092.rs
diff --git a/tests/rustdoc/impl-associated-items-order.rs b/tests/rustdoc/impl/impl-associated-items-order.rs
similarity index 100%
rename from tests/rustdoc/impl-associated-items-order.rs
rename to tests/rustdoc/impl/impl-associated-items-order.rs
diff --git a/tests/rustdoc/impl-associated-items-sidebar.rs b/tests/rustdoc/impl/impl-associated-items-sidebar.rs
similarity index 100%
rename from tests/rustdoc/impl-associated-items-sidebar.rs
rename to tests/rustdoc/impl/impl-associated-items-sidebar.rs
diff --git a/tests/rustdoc/impl-blanket-53689.rs b/tests/rustdoc/impl/impl-blanket-53689.rs
similarity index 100%
rename from tests/rustdoc/impl-blanket-53689.rs
rename to tests/rustdoc/impl/impl-blanket-53689.rs
diff --git a/tests/rustdoc/impl-box.rs b/tests/rustdoc/impl/impl-box.rs
similarity index 100%
rename from tests/rustdoc/impl-box.rs
rename to tests/rustdoc/impl/impl-box.rs
diff --git a/tests/rustdoc/impl-disambiguation.rs b/tests/rustdoc/impl/impl-disambiguation.rs
similarity index 100%
rename from tests/rustdoc/impl-disambiguation.rs
rename to tests/rustdoc/impl/impl-disambiguation.rs
diff --git a/tests/rustdoc/impl-everywhere.rs b/tests/rustdoc/impl/impl-everywhere.rs
similarity index 100%
rename from tests/rustdoc/impl-everywhere.rs
rename to tests/rustdoc/impl/impl-everywhere.rs
diff --git a/tests/rustdoc/impl-in-const-block.rs b/tests/rustdoc/impl/impl-in-const-block.rs
similarity index 100%
rename from tests/rustdoc/impl-in-const-block.rs
rename to tests/rustdoc/impl/impl-in-const-block.rs
diff --git a/tests/rustdoc/impl-on-ty-alias-issue-119015.rs b/tests/rustdoc/impl/impl-on-ty-alias-issue-119015.rs
similarity index 100%
rename from tests/rustdoc/impl-on-ty-alias-issue-119015.rs
rename to tests/rustdoc/impl/impl-on-ty-alias-issue-119015.rs
diff --git a/tests/rustdoc/impl-parts-crosscrate.rs b/tests/rustdoc/impl/impl-parts-crosscrate.rs
similarity index 100%
rename from tests/rustdoc/impl-parts-crosscrate.rs
rename to tests/rustdoc/impl/impl-parts-crosscrate.rs
diff --git a/tests/rustdoc/impl-parts.rs b/tests/rustdoc/impl/impl-parts.rs
similarity index 100%
rename from tests/rustdoc/impl-parts.rs
rename to tests/rustdoc/impl/impl-parts.rs
diff --git a/tests/rustdoc/impl-ref-20175.rs b/tests/rustdoc/impl/impl-ref-20175.rs
similarity index 100%
rename from tests/rustdoc/impl-ref-20175.rs
rename to tests/rustdoc/impl/impl-ref-20175.rs
diff --git a/tests/rustdoc/impl-trait-43869.rs b/tests/rustdoc/impl/impl-trait-43869.rs
similarity index 100%
rename from tests/rustdoc/impl-trait-43869.rs
rename to tests/rustdoc/impl/impl-trait-43869.rs
diff --git a/tests/rustdoc/impl-trait-alias.rs b/tests/rustdoc/impl/impl-trait-alias.rs
similarity index 100%
rename from tests/rustdoc/impl-trait-alias.rs
rename to tests/rustdoc/impl/impl-trait-alias.rs
diff --git a/tests/rustdoc/impl-trait-precise-capturing.rs b/tests/rustdoc/impl/impl-trait-precise-capturing.rs
similarity index 100%
rename from tests/rustdoc/impl-trait-precise-capturing.rs
rename to tests/rustdoc/impl/impl-trait-precise-capturing.rs
diff --git a/tests/rustdoc/impl-type-parameter-33592.rs b/tests/rustdoc/impl/impl-type-parameter-33592.rs
similarity index 100%
rename from tests/rustdoc/impl-type-parameter-33592.rs
rename to tests/rustdoc/impl/impl-type-parameter-33592.rs
diff --git a/tests/rustdoc/implementor-stable-version.rs b/tests/rustdoc/impl/implementor-stable-version.rs
similarity index 100%
rename from tests/rustdoc/implementor-stable-version.rs
rename to tests/rustdoc/impl/implementor-stable-version.rs
diff --git a/tests/rustdoc/implementors-unstable-75588.rs b/tests/rustdoc/impl/implementors-unstable-75588.rs
similarity index 100%
rename from tests/rustdoc/implementors-unstable-75588.rs
rename to tests/rustdoc/impl/implementors-unstable-75588.rs
diff --git a/tests/rustdoc/inline-impl-through-glob-import-100204.rs b/tests/rustdoc/impl/inline-impl-through-glob-import-100204.rs
similarity index 100%
rename from tests/rustdoc/inline-impl-through-glob-import-100204.rs
rename to tests/rustdoc/impl/inline-impl-through-glob-import-100204.rs
diff --git a/tests/rustdoc/manual_impl.rs b/tests/rustdoc/impl/manual_impl.rs
similarity index 100%
rename from tests/rustdoc/manual_impl.rs
rename to tests/rustdoc/impl/manual_impl.rs
diff --git a/tests/rustdoc/method-link-foreign-trait-impl-17476.rs b/tests/rustdoc/impl/method-link-foreign-trait-impl-17476.rs
similarity index 100%
rename from tests/rustdoc/method-link-foreign-trait-impl-17476.rs
rename to tests/rustdoc/impl/method-link-foreign-trait-impl-17476.rs
diff --git a/tests/rustdoc/module-impls.rs b/tests/rustdoc/impl/module-impls.rs
similarity index 100%
rename from tests/rustdoc/module-impls.rs
rename to tests/rustdoc/impl/module-impls.rs
diff --git a/tests/rustdoc/must_implement_one_of.rs b/tests/rustdoc/impl/must_implement_one_of.rs
similarity index 100%
rename from tests/rustdoc/must_implement_one_of.rs
rename to tests/rustdoc/impl/must_implement_one_of.rs
diff --git a/tests/rustdoc/negative-impl-no-items.rs b/tests/rustdoc/impl/negative-impl-no-items.rs
similarity index 100%
rename from tests/rustdoc/negative-impl-no-items.rs
rename to tests/rustdoc/impl/negative-impl-no-items.rs
diff --git a/tests/rustdoc/negative-impl-sidebar.rs b/tests/rustdoc/impl/negative-impl-sidebar.rs
similarity index 100%
rename from tests/rustdoc/negative-impl-sidebar.rs
rename to tests/rustdoc/impl/negative-impl-sidebar.rs
diff --git a/tests/rustdoc/negative-impl.rs b/tests/rustdoc/impl/negative-impl.rs
similarity index 100%
rename from tests/rustdoc/negative-impl.rs
rename to tests/rustdoc/impl/negative-impl.rs
diff --git a/tests/rustdoc/return-impl-trait.rs b/tests/rustdoc/impl/return-impl-trait.rs
similarity index 100%
rename from tests/rustdoc/return-impl-trait.rs
rename to tests/rustdoc/impl/return-impl-trait.rs
diff --git a/tests/rustdoc/rustc-incoherent-impls.rs b/tests/rustdoc/impl/rustc-incoherent-impls.rs
similarity index 100%
rename from tests/rustdoc/rustc-incoherent-impls.rs
rename to tests/rustdoc/impl/rustc-incoherent-impls.rs
diff --git a/tests/rustdoc/same-crate-hidden-impl-parameter.rs b/tests/rustdoc/impl/same-crate-hidden-impl-parameter.rs
similarity index 100%
rename from tests/rustdoc/same-crate-hidden-impl-parameter.rs
rename to tests/rustdoc/impl/same-crate-hidden-impl-parameter.rs
diff --git a/tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs b/tests/rustdoc/impl/sidebar-trait-impl-disambiguate-78701.rs
similarity index 100%
rename from tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs
rename to tests/rustdoc/impl/sidebar-trait-impl-disambiguate-78701.rs
diff --git a/tests/rustdoc/struct-implementations-title.rs b/tests/rustdoc/impl/struct-implementations-title.rs
similarity index 100%
rename from tests/rustdoc/struct-implementations-title.rs
rename to tests/rustdoc/impl/struct-implementations-title.rs
diff --git a/tests/rustdoc/trait-impl.rs b/tests/rustdoc/impl/trait-impl.rs
similarity index 100%
rename from tests/rustdoc/trait-impl.rs
rename to tests/rustdoc/impl/trait-impl.rs
diff --git a/tests/rustdoc/trait-implementations-duplicate-self-45584.rs b/tests/rustdoc/impl/trait-implementations-duplicate-self-45584.rs
similarity index 100%
rename from tests/rustdoc/trait-implementations-duplicate-self-45584.rs
rename to tests/rustdoc/impl/trait-implementations-duplicate-self-45584.rs
diff --git a/tests/rustdoc/underscore-type-in-trait-impl-96381.rs b/tests/rustdoc/impl/underscore-type-in-trait-impl-96381.rs
similarity index 100%
rename from tests/rustdoc/underscore-type-in-trait-impl-96381.rs
rename to tests/rustdoc/impl/underscore-type-in-trait-impl-96381.rs
diff --git a/tests/rustdoc/universal-impl-trait.rs b/tests/rustdoc/impl/universal-impl-trait.rs
similarity index 100%
rename from tests/rustdoc/universal-impl-trait.rs
rename to tests/rustdoc/impl/universal-impl-trait.rs
diff --git a/tests/rustdoc/unneeded-trait-implementations-title.rs b/tests/rustdoc/impl/unneeded-trait-implementations-title.rs
similarity index 100%
rename from tests/rustdoc/unneeded-trait-implementations-title.rs
rename to tests/rustdoc/impl/unneeded-trait-implementations-title.rs
diff --git a/tests/rustdoc/ice-intra-doc-links-107995.rs b/tests/rustdoc/intra-doc/ice-intra-doc-links-107995.rs
similarity index 100%
rename from tests/rustdoc/ice-intra-doc-links-107995.rs
rename to tests/rustdoc/intra-doc/ice-intra-doc-links-107995.rs
diff --git a/tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs b/tests/rustdoc/intra-doc/intra-doc-link-method-trait-impl-72340.rs
similarity index 100%
rename from tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs
rename to tests/rustdoc/intra-doc/intra-doc-link-method-trait-impl-72340.rs
diff --git a/tests/rustdoc/auxiliary/jump-to-def-macro.rs b/tests/rustdoc/jump-to-def/auxiliary/jump-to-def-macro.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/jump-to-def-macro.rs
rename to tests/rustdoc/jump-to-def/auxiliary/jump-to-def-macro.rs
diff --git a/tests/rustdoc/jump-to-def-doc-links-calls.rs b/tests/rustdoc/jump-to-def/jump-to-def-doc-links-calls.rs
similarity index 100%
rename from tests/rustdoc/jump-to-def-doc-links-calls.rs
rename to tests/rustdoc/jump-to-def/jump-to-def-doc-links-calls.rs
diff --git a/tests/rustdoc/jump-to-def-doc-links.rs b/tests/rustdoc/jump-to-def/jump-to-def-doc-links.rs
similarity index 100%
rename from tests/rustdoc/jump-to-def-doc-links.rs
rename to tests/rustdoc/jump-to-def/jump-to-def-doc-links.rs
diff --git a/tests/rustdoc/jump-to-def-macro.rs b/tests/rustdoc/jump-to-def/jump-to-def-macro.rs
similarity index 100%
rename from tests/rustdoc/jump-to-def-macro.rs
rename to tests/rustdoc/jump-to-def/jump-to-def-macro.rs
diff --git a/tests/rustdoc/jump-to-def-pats.rs b/tests/rustdoc/jump-to-def/jump-to-def-pats.rs
similarity index 100%
rename from tests/rustdoc/jump-to-def-pats.rs
rename to tests/rustdoc/jump-to-def/jump-to-def-pats.rs
diff --git a/tests/rustdoc/jump-to-def-prelude-types.rs b/tests/rustdoc/jump-to-def/jump-to-def-prelude-types.rs
similarity index 100%
rename from tests/rustdoc/jump-to-def-prelude-types.rs
rename to tests/rustdoc/jump-to-def/jump-to-def-prelude-types.rs
diff --git a/tests/rustdoc/jump-to-non-local-method.rs b/tests/rustdoc/jump-to-def/jump-to-non-local-method.rs
similarity index 100%
rename from tests/rustdoc/jump-to-non-local-method.rs
rename to tests/rustdoc/jump-to-def/jump-to-non-local-method.rs
diff --git a/tests/rustdoc/auxiliary/external-macro-src.rs b/tests/rustdoc/macro/auxiliary/external-macro-src.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/external-macro-src.rs
rename to tests/rustdoc/macro/auxiliary/external-macro-src.rs
diff --git a/tests/rustdoc/macro/auxiliary/issue-99221-aux.rs b/tests/rustdoc/macro/auxiliary/issue-99221-aux.rs
new file mode 100644
index 0000000000000..e061e42b29db8
--- /dev/null
+++ b/tests/rustdoc/macro/auxiliary/issue-99221-aux.rs
@@ -0,0 +1,20 @@
+pub struct Option;
+impl Option {
+    pub fn unwrap(self) {}
+}
+
+mod macros {
+    use crate::Option;
+    /// [`Option::unwrap`]
+    #[macro_export]
+    macro_rules! print {
+        () => ()
+    }
+}
+
+mod structs {
+    use crate::Option;
+    /// [`Option::unwrap`]
+    pub struct Print;
+}
+pub use structs::Print;
diff --git a/tests/rustdoc/auxiliary/macro_pub_in_module.rs b/tests/rustdoc/macro/auxiliary/macro_pub_in_module.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/macro_pub_in_module.rs
rename to tests/rustdoc/macro/auxiliary/macro_pub_in_module.rs
diff --git a/tests/rustdoc/auxiliary/pub-use-extern-macros.rs b/tests/rustdoc/macro/auxiliary/pub-use-extern-macros.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/pub-use-extern-macros.rs
rename to tests/rustdoc/macro/auxiliary/pub-use-extern-macros.rs
diff --git a/tests/rustdoc/compiler-derive-proc-macro.rs b/tests/rustdoc/macro/compiler-derive-proc-macro.rs
similarity index 100%
rename from tests/rustdoc/compiler-derive-proc-macro.rs
rename to tests/rustdoc/macro/compiler-derive-proc-macro.rs
diff --git a/tests/rustdoc/const-rendering-macros-33302.rs b/tests/rustdoc/macro/const-rendering-macros-33302.rs
similarity index 100%
rename from tests/rustdoc/const-rendering-macros-33302.rs
rename to tests/rustdoc/macro/const-rendering-macros-33302.rs
diff --git a/tests/rustdoc/decl_macro.rs b/tests/rustdoc/macro/decl_macro.rs
similarity index 100%
rename from tests/rustdoc/decl_macro.rs
rename to tests/rustdoc/macro/decl_macro.rs
diff --git a/tests/rustdoc/decl_macro_priv.rs b/tests/rustdoc/macro/decl_macro_priv.rs
similarity index 100%
rename from tests/rustdoc/decl_macro_priv.rs
rename to tests/rustdoc/macro/decl_macro_priv.rs
diff --git a/tests/rustdoc/doc-proc-macro.rs b/tests/rustdoc/macro/doc-proc-macro.rs
similarity index 100%
rename from tests/rustdoc/doc-proc-macro.rs
rename to tests/rustdoc/macro/doc-proc-macro.rs
diff --git a/tests/rustdoc/external-macro-src.rs b/tests/rustdoc/macro/external-macro-src.rs
similarity index 100%
rename from tests/rustdoc/external-macro-src.rs
rename to tests/rustdoc/macro/external-macro-src.rs
diff --git a/tests/rustdoc/macro-const-display-115295.rs b/tests/rustdoc/macro/macro-const-display-115295.rs
similarity index 100%
rename from tests/rustdoc/macro-const-display-115295.rs
rename to tests/rustdoc/macro/macro-const-display-115295.rs
diff --git a/tests/rustdoc/macro-doc-comment-23812.rs b/tests/rustdoc/macro/macro-doc-comment-23812.rs
similarity index 100%
rename from tests/rustdoc/macro-doc-comment-23812.rs
rename to tests/rustdoc/macro/macro-doc-comment-23812.rs
diff --git a/tests/rustdoc/macro-export-crate-root-108231.rs b/tests/rustdoc/macro/macro-export-crate-root-108231.rs
similarity index 100%
rename from tests/rustdoc/macro-export-crate-root-108231.rs
rename to tests/rustdoc/macro/macro-export-crate-root-108231.rs
diff --git a/tests/rustdoc/macro-generated-macro.macro_linebreak_pre.html b/tests/rustdoc/macro/macro-generated-macro.macro_linebreak_pre.html
similarity index 100%
rename from tests/rustdoc/macro-generated-macro.macro_linebreak_pre.html
rename to tests/rustdoc/macro/macro-generated-macro.macro_linebreak_pre.html
diff --git a/tests/rustdoc/macro-generated-macro.macro_morestuff_pre.html b/tests/rustdoc/macro/macro-generated-macro.macro_morestuff_pre.html
similarity index 100%
rename from tests/rustdoc/macro-generated-macro.macro_morestuff_pre.html
rename to tests/rustdoc/macro/macro-generated-macro.macro_morestuff_pre.html
diff --git a/tests/rustdoc/macro-generated-macro.rs b/tests/rustdoc/macro/macro-generated-macro.rs
similarity index 100%
rename from tests/rustdoc/macro-generated-macro.rs
rename to tests/rustdoc/macro/macro-generated-macro.rs
diff --git a/tests/rustdoc/macro-higher-kinded-function.rs b/tests/rustdoc/macro/macro-higher-kinded-function.rs
similarity index 100%
rename from tests/rustdoc/macro-higher-kinded-function.rs
rename to tests/rustdoc/macro/macro-higher-kinded-function.rs
diff --git a/tests/rustdoc/macro-ice-16019.rs b/tests/rustdoc/macro/macro-ice-16019.rs
similarity index 100%
rename from tests/rustdoc/macro-ice-16019.rs
rename to tests/rustdoc/macro/macro-ice-16019.rs
diff --git a/tests/rustdoc/macro-in-async-block.rs b/tests/rustdoc/macro/macro-in-async-block.rs
similarity index 100%
rename from tests/rustdoc/macro-in-async-block.rs
rename to tests/rustdoc/macro/macro-in-async-block.rs
diff --git a/tests/rustdoc/macro-in-closure.rs b/tests/rustdoc/macro/macro-in-closure.rs
similarity index 100%
rename from tests/rustdoc/macro-in-closure.rs
rename to tests/rustdoc/macro/macro-in-closure.rs
diff --git a/tests/rustdoc/macro-indirect-use.rs b/tests/rustdoc/macro/macro-indirect-use.rs
similarity index 100%
rename from tests/rustdoc/macro-indirect-use.rs
rename to tests/rustdoc/macro/macro-indirect-use.rs
diff --git a/tests/rustdoc/macro_pub_in_module.rs b/tests/rustdoc/macro/macro_pub_in_module.rs
similarity index 100%
rename from tests/rustdoc/macro_pub_in_module.rs
rename to tests/rustdoc/macro/macro_pub_in_module.rs
diff --git a/tests/rustdoc/macro_rules-matchers.rs b/tests/rustdoc/macro/macro_rules-matchers.rs
similarity index 100%
rename from tests/rustdoc/macro_rules-matchers.rs
rename to tests/rustdoc/macro/macro_rules-matchers.rs
diff --git a/tests/rustdoc/macros.rs b/tests/rustdoc/macro/macros.rs
similarity index 100%
rename from tests/rustdoc/macros.rs
rename to tests/rustdoc/macro/macros.rs
diff --git a/tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs b/tests/rustdoc/macro/multiple-macro-rules-w-same-name-99221.rs
similarity index 100%
rename from tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs
rename to tests/rustdoc/macro/multiple-macro-rules-w-same-name-99221.rs
diff --git a/tests/rustdoc/multiple-macro-rules-w-same-name-submodule-99221.rs b/tests/rustdoc/macro/multiple-macro-rules-w-same-name-submodule-99221.rs
similarity index 100%
rename from tests/rustdoc/multiple-macro-rules-w-same-name-submodule-99221.rs
rename to tests/rustdoc/macro/multiple-macro-rules-w-same-name-submodule-99221.rs
diff --git a/tests/rustdoc/proc-macro.rs b/tests/rustdoc/macro/proc-macro.rs
similarity index 100%
rename from tests/rustdoc/proc-macro.rs
rename to tests/rustdoc/macro/proc-macro.rs
diff --git a/tests/rustdoc/pub-use-extern-macros.rs b/tests/rustdoc/macro/pub-use-extern-macros.rs
similarity index 100%
rename from tests/rustdoc/pub-use-extern-macros.rs
rename to tests/rustdoc/macro/pub-use-extern-macros.rs
diff --git a/tests/rustdoc/rustc-macro-crate.rs b/tests/rustdoc/macro/rustc-macro-crate.rs
similarity index 100%
rename from tests/rustdoc/rustc-macro-crate.rs
rename to tests/rustdoc/macro/rustc-macro-crate.rs
diff --git a/tests/rustdoc/auxiliary/issue-15318.rs b/tests/rustdoc/primitive/auxiliary/issue-15318.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-15318.rs
rename to tests/rustdoc/primitive/auxiliary/issue-15318.rs
diff --git a/tests/rustdoc/auxiliary/primitive-doc.rs b/tests/rustdoc/primitive/auxiliary/primitive-doc.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/primitive-doc.rs
rename to tests/rustdoc/primitive/auxiliary/primitive-doc.rs
diff --git a/tests/rustdoc/cross-crate-primitive-doc.rs b/tests/rustdoc/primitive/cross-crate-primitive-doc.rs
similarity index 100%
rename from tests/rustdoc/cross-crate-primitive-doc.rs
rename to tests/rustdoc/primitive/cross-crate-primitive-doc.rs
diff --git a/tests/rustdoc/no_std-primitive.rs b/tests/rustdoc/primitive/no_std-primitive.rs
similarity index 100%
rename from tests/rustdoc/no_std-primitive.rs
rename to tests/rustdoc/primitive/no_std-primitive.rs
diff --git a/tests/rustdoc/primitive-link.rs b/tests/rustdoc/primitive/primitive-link.rs
similarity index 100%
rename from tests/rustdoc/primitive-link.rs
rename to tests/rustdoc/primitive/primitive-link.rs
diff --git a/tests/rustdoc/primitive-raw-pointer-dox-15318-3.rs b/tests/rustdoc/primitive/primitive-raw-pointer-dox-15318-3.rs
similarity index 100%
rename from tests/rustdoc/primitive-raw-pointer-dox-15318-3.rs
rename to tests/rustdoc/primitive/primitive-raw-pointer-dox-15318-3.rs
diff --git a/tests/rustdoc/primitive-raw-pointer-link-15318.rs b/tests/rustdoc/primitive/primitive-raw-pointer-link-15318.rs
similarity index 100%
rename from tests/rustdoc/primitive-raw-pointer-link-15318.rs
rename to tests/rustdoc/primitive/primitive-raw-pointer-link-15318.rs
diff --git a/tests/rustdoc/primitive-raw-pointer-link-no-inlined-15318-2.rs b/tests/rustdoc/primitive/primitive-raw-pointer-link-no-inlined-15318-2.rs
similarity index 100%
rename from tests/rustdoc/primitive-raw-pointer-link-no-inlined-15318-2.rs
rename to tests/rustdoc/primitive/primitive-raw-pointer-link-no-inlined-15318-2.rs
diff --git a/tests/rustdoc/primitive-reference.rs b/tests/rustdoc/primitive/primitive-reference.rs
similarity index 100%
rename from tests/rustdoc/primitive-reference.rs
rename to tests/rustdoc/primitive/primitive-reference.rs
diff --git a/tests/rustdoc/primitive-slice-auto-trait.rs b/tests/rustdoc/primitive/primitive-slice-auto-trait.rs
similarity index 100%
rename from tests/rustdoc/primitive-slice-auto-trait.rs
rename to tests/rustdoc/primitive/primitive-slice-auto-trait.rs
diff --git a/tests/rustdoc/primitive-tuple-auto-trait.rs b/tests/rustdoc/primitive/primitive-tuple-auto-trait.rs
similarity index 100%
rename from tests/rustdoc/primitive-tuple-auto-trait.rs
rename to tests/rustdoc/primitive/primitive-tuple-auto-trait.rs
diff --git a/tests/rustdoc/primitive-tuple-variadic.rs b/tests/rustdoc/primitive/primitive-tuple-variadic.rs
similarity index 100%
rename from tests/rustdoc/primitive-tuple-variadic.rs
rename to tests/rustdoc/primitive/primitive-tuple-variadic.rs
diff --git a/tests/rustdoc/primitive-unit-auto-trait.rs b/tests/rustdoc/primitive/primitive-unit-auto-trait.rs
similarity index 100%
rename from tests/rustdoc/primitive-unit-auto-trait.rs
rename to tests/rustdoc/primitive/primitive-unit-auto-trait.rs
diff --git a/tests/rustdoc/search-index-primitive-inherent-method-23511.rs b/tests/rustdoc/primitive/search-index-primitive-inherent-method-23511.rs
similarity index 100%
rename from tests/rustdoc/search-index-primitive-inherent-method-23511.rs
rename to tests/rustdoc/primitive/search-index-primitive-inherent-method-23511.rs
diff --git a/tests/rustdoc/doc-hidden-private-67851-both.rs b/tests/rustdoc/private/doc-hidden-private-67851-both.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-private-67851-both.rs
rename to tests/rustdoc/private/doc-hidden-private-67851-both.rs
diff --git a/tests/rustdoc/doc-hidden-private-67851-hidden.rs b/tests/rustdoc/private/doc-hidden-private-67851-hidden.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-private-67851-hidden.rs
rename to tests/rustdoc/private/doc-hidden-private-67851-hidden.rs
diff --git a/tests/rustdoc/doc-hidden-private-67851-neither.rs b/tests/rustdoc/private/doc-hidden-private-67851-neither.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-private-67851-neither.rs
rename to tests/rustdoc/private/doc-hidden-private-67851-neither.rs
diff --git a/tests/rustdoc/doc-hidden-private-67851-private.rs b/tests/rustdoc/private/doc-hidden-private-67851-private.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-private-67851-private.rs
rename to tests/rustdoc/private/doc-hidden-private-67851-private.rs
diff --git a/tests/rustdoc/empty-impl-block-private-with-doc.rs b/tests/rustdoc/private/empty-impl-block-private-with-doc.rs
similarity index 100%
rename from tests/rustdoc/empty-impl-block-private-with-doc.rs
rename to tests/rustdoc/private/empty-impl-block-private-with-doc.rs
diff --git a/tests/rustdoc/empty-impl-block-private.rs b/tests/rustdoc/private/empty-impl-block-private.rs
similarity index 100%
rename from tests/rustdoc/empty-impl-block-private.rs
rename to tests/rustdoc/private/empty-impl-block-private.rs
diff --git a/tests/rustdoc/empty-mod-private.rs b/tests/rustdoc/private/empty-mod-private.rs
similarity index 100%
rename from tests/rustdoc/empty-mod-private.rs
rename to tests/rustdoc/private/empty-mod-private.rs
diff --git a/tests/rustdoc/enum-variant-private-46767.rs b/tests/rustdoc/private/enum-variant-private-46767.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-private-46767.rs
rename to tests/rustdoc/private/enum-variant-private-46767.rs
diff --git a/tests/rustdoc/files-creation-private.rs b/tests/rustdoc/private/files-creation-private.rs
similarity index 100%
rename from tests/rustdoc/files-creation-private.rs
rename to tests/rustdoc/private/files-creation-private.rs
diff --git a/tests/rustdoc/hidden-private.rs b/tests/rustdoc/private/hidden-private.rs
similarity index 100%
rename from tests/rustdoc/hidden-private.rs
rename to tests/rustdoc/private/hidden-private.rs
diff --git a/tests/rustdoc/inline-private-with-intermediate-doc-hidden.rs b/tests/rustdoc/private/inline-private-with-intermediate-doc-hidden.rs
similarity index 100%
rename from tests/rustdoc/inline-private-with-intermediate-doc-hidden.rs
rename to tests/rustdoc/private/inline-private-with-intermediate-doc-hidden.rs
diff --git a/tests/rustdoc/inner-private-110422.rs b/tests/rustdoc/private/inner-private-110422.rs
similarity index 100%
rename from tests/rustdoc/inner-private-110422.rs
rename to tests/rustdoc/private/inner-private-110422.rs
diff --git a/tests/rustdoc/macro-document-private-duplicate.rs b/tests/rustdoc/private/macro-document-private-duplicate.rs
similarity index 100%
rename from tests/rustdoc/macro-document-private-duplicate.rs
rename to tests/rustdoc/private/macro-document-private-duplicate.rs
diff --git a/tests/rustdoc/macro-document-private.rs b/tests/rustdoc/private/macro-document-private.rs
similarity index 100%
rename from tests/rustdoc/macro-document-private.rs
rename to tests/rustdoc/private/macro-document-private.rs
diff --git a/tests/rustdoc/macro-private-not-documented.rs b/tests/rustdoc/private/macro-private-not-documented.rs
similarity index 100%
rename from tests/rustdoc/macro-private-not-documented.rs
rename to tests/rustdoc/private/macro-private-not-documented.rs
diff --git a/tests/rustdoc/missing-private-inlining-109258.rs b/tests/rustdoc/private/missing-private-inlining-109258.rs
similarity index 100%
rename from tests/rustdoc/missing-private-inlining-109258.rs
rename to tests/rustdoc/private/missing-private-inlining-109258.rs
diff --git a/tests/rustdoc/private-fields-tuple-struct.rs b/tests/rustdoc/private/private-fields-tuple-struct.rs
similarity index 100%
rename from tests/rustdoc/private-fields-tuple-struct.rs
rename to tests/rustdoc/private/private-fields-tuple-struct.rs
diff --git a/tests/rustdoc/private-non-local-fields-2.rs b/tests/rustdoc/private/private-non-local-fields-2.rs
similarity index 100%
rename from tests/rustdoc/private-non-local-fields-2.rs
rename to tests/rustdoc/private/private-non-local-fields-2.rs
diff --git a/tests/rustdoc/private-non-local-fields.rs b/tests/rustdoc/private/private-non-local-fields.rs
similarity index 100%
rename from tests/rustdoc/private-non-local-fields.rs
rename to tests/rustdoc/private/private-non-local-fields.rs
diff --git a/tests/rustdoc/private-type-alias.rs b/tests/rustdoc/private/private-type-alias.rs
similarity index 100%
rename from tests/rustdoc/private-type-alias.rs
rename to tests/rustdoc/private/private-type-alias.rs
diff --git a/tests/rustdoc/private-type-cycle-110629.rs b/tests/rustdoc/private/private-type-cycle-110629.rs
similarity index 100%
rename from tests/rustdoc/private-type-cycle-110629.rs
rename to tests/rustdoc/private/private-type-cycle-110629.rs
diff --git a/tests/rustdoc/private-use-decl-macro-47038.rs b/tests/rustdoc/private/private-use-decl-macro-47038.rs
similarity index 100%
rename from tests/rustdoc/private-use-decl-macro-47038.rs
rename to tests/rustdoc/private/private-use-decl-macro-47038.rs
diff --git a/tests/rustdoc/private-use.rs b/tests/rustdoc/private/private-use.rs
similarity index 100%
rename from tests/rustdoc/private-use.rs
rename to tests/rustdoc/private/private-use.rs
diff --git a/tests/rustdoc/public-impl-mention-private-generic-46380-2.rs b/tests/rustdoc/private/public-impl-mention-private-generic-46380-2.rs
similarity index 100%
rename from tests/rustdoc/public-impl-mention-private-generic-46380-2.rs
rename to tests/rustdoc/private/public-impl-mention-private-generic-46380-2.rs
diff --git a/tests/rustdoc/traits-in-bodies-private.rs b/tests/rustdoc/private/traits-in-bodies-private.rs
similarity index 100%
rename from tests/rustdoc/traits-in-bodies-private.rs
rename to tests/rustdoc/private/traits-in-bodies-private.rs
diff --git a/tests/rustdoc/alias-reexport.rs b/tests/rustdoc/reexport/alias-reexport.rs
similarity index 100%
rename from tests/rustdoc/alias-reexport.rs
rename to tests/rustdoc/reexport/alias-reexport.rs
diff --git a/tests/rustdoc/alias-reexport2.rs b/tests/rustdoc/reexport/alias-reexport2.rs
similarity index 100%
rename from tests/rustdoc/alias-reexport2.rs
rename to tests/rustdoc/reexport/alias-reexport2.rs
diff --git a/tests/rustdoc/anonymous-reexport-108931.rs b/tests/rustdoc/reexport/anonymous-reexport-108931.rs
similarity index 100%
rename from tests/rustdoc/anonymous-reexport-108931.rs
rename to tests/rustdoc/reexport/anonymous-reexport-108931.rs
diff --git a/tests/rustdoc/anonymous-reexport.rs b/tests/rustdoc/reexport/anonymous-reexport.rs
similarity index 100%
rename from tests/rustdoc/anonymous-reexport.rs
rename to tests/rustdoc/reexport/anonymous-reexport.rs
diff --git a/tests/rustdoc/auxiliary/alias-reexport.rs b/tests/rustdoc/reexport/auxiliary/alias-reexport.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/alias-reexport.rs
rename to tests/rustdoc/reexport/auxiliary/alias-reexport.rs
diff --git a/tests/rustdoc/auxiliary/alias-reexport2.rs b/tests/rustdoc/reexport/auxiliary/alias-reexport2.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/alias-reexport2.rs
rename to tests/rustdoc/reexport/auxiliary/alias-reexport2.rs
diff --git a/tests/rustdoc/reexport/auxiliary/all-item-types.rs b/tests/rustdoc/reexport/auxiliary/all-item-types.rs
new file mode 100644
index 0000000000000..f94bd998717a0
--- /dev/null
+++ b/tests/rustdoc/reexport/auxiliary/all-item-types.rs
@@ -0,0 +1,22 @@
+#![feature(extern_types)]
+
+pub mod foo_mod {}
+extern "C" {
+    pub fn foo_ffn();
+    pub static FOO_FSTATIC: FooStruct;
+    pub type FooFType;
+}
+pub fn foo_fn() {}
+pub trait FooTrait {}
+pub struct FooStruct;
+pub enum FooEnum {}
+pub union FooUnion {
+    x: (),
+}
+pub type FooType = FooStruct;
+pub static FOO_STATIC: FooStruct = FooStruct;
+pub const FOO_CONSTANT: FooStruct = FooStruct;
+#[macro_export]
+macro_rules! foo_macro {
+    () => ();
+}
diff --git a/tests/rustdoc/auxiliary/issue-113982-doc_auto_cfg-reexport-foreign.rs b/tests/rustdoc/reexport/auxiliary/issue-113982-doc_auto_cfg-reexport-foreign.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-113982-doc_auto_cfg-reexport-foreign.rs
rename to tests/rustdoc/reexport/auxiliary/issue-113982-doc_auto_cfg-reexport-foreign.rs
diff --git a/tests/rustdoc/auxiliary/issue-28927-1.rs b/tests/rustdoc/reexport/auxiliary/issue-28927-1.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-28927-1.rs
rename to tests/rustdoc/reexport/auxiliary/issue-28927-1.rs
diff --git a/tests/rustdoc/auxiliary/issue-28927-2.rs b/tests/rustdoc/reexport/auxiliary/issue-28927-2.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-28927-2.rs
rename to tests/rustdoc/reexport/auxiliary/issue-28927-2.rs
diff --git a/tests/rustdoc/auxiliary/primitive-reexport.rs b/tests/rustdoc/reexport/auxiliary/primitive-reexport.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/primitive-reexport.rs
rename to tests/rustdoc/reexport/auxiliary/primitive-reexport.rs
diff --git a/tests/rustdoc/auxiliary/reexport-check.rs b/tests/rustdoc/reexport/auxiliary/reexport-check.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/reexport-check.rs
rename to tests/rustdoc/reexport/auxiliary/reexport-check.rs
diff --git a/tests/rustdoc/auxiliary/reexport-doc-aux.rs b/tests/rustdoc/reexport/auxiliary/reexport-doc-aux.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/reexport-doc-aux.rs
rename to tests/rustdoc/reexport/auxiliary/reexport-doc-aux.rs
diff --git a/tests/rustdoc/auxiliary/reexports.rs b/tests/rustdoc/reexport/auxiliary/reexports.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/reexports.rs
rename to tests/rustdoc/reexport/auxiliary/reexports.rs
diff --git a/tests/rustdoc/blanket-reexport-item.rs b/tests/rustdoc/reexport/blanket-reexport-item.rs
similarity index 100%
rename from tests/rustdoc/blanket-reexport-item.rs
rename to tests/rustdoc/reexport/blanket-reexport-item.rs
diff --git a/tests/rustdoc/cfg_doc_reexport.rs b/tests/rustdoc/reexport/cfg_doc_reexport.rs
similarity index 100%
rename from tests/rustdoc/cfg_doc_reexport.rs
rename to tests/rustdoc/reexport/cfg_doc_reexport.rs
diff --git a/tests/rustdoc/doc-hidden-reexports-109449.rs b/tests/rustdoc/reexport/doc-hidden-reexports-109449.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-reexports-109449.rs
rename to tests/rustdoc/reexport/doc-hidden-reexports-109449.rs
diff --git a/tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs b/tests/rustdoc/reexport/doc_auto_cfg-reexport-foreign-113982.rs
similarity index 100%
rename from tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs
rename to tests/rustdoc/reexport/doc_auto_cfg-reexport-foreign-113982.rs
diff --git a/tests/rustdoc/duplicated-glob-reexport-60522.rs b/tests/rustdoc/reexport/duplicated-glob-reexport-60522.rs
similarity index 100%
rename from tests/rustdoc/duplicated-glob-reexport-60522.rs
rename to tests/rustdoc/reexport/duplicated-glob-reexport-60522.rs
diff --git a/tests/rustdoc/enum-variant-reexport-35488.rs b/tests/rustdoc/reexport/enum-variant-reexport-35488.rs
similarity index 100%
rename from tests/rustdoc/enum-variant-reexport-35488.rs
rename to tests/rustdoc/reexport/enum-variant-reexport-35488.rs
diff --git a/tests/rustdoc/foreigntype-reexport.rs b/tests/rustdoc/reexport/foreigntype-reexport.rs
similarity index 100%
rename from tests/rustdoc/foreigntype-reexport.rs
rename to tests/rustdoc/reexport/foreigntype-reexport.rs
diff --git a/tests/rustdoc/glob-reexport-attribute-merge-120487.rs b/tests/rustdoc/reexport/glob-reexport-attribute-merge-120487.rs
similarity index 100%
rename from tests/rustdoc/glob-reexport-attribute-merge-120487.rs
rename to tests/rustdoc/reexport/glob-reexport-attribute-merge-120487.rs
diff --git a/tests/rustdoc/glob-reexport-attribute-merge-doc-auto-cfg.rs b/tests/rustdoc/reexport/glob-reexport-attribute-merge-doc-auto-cfg.rs
similarity index 100%
rename from tests/rustdoc/glob-reexport-attribute-merge-doc-auto-cfg.rs
rename to tests/rustdoc/reexport/glob-reexport-attribute-merge-doc-auto-cfg.rs
diff --git a/tests/rustdoc/ice-reexport-crate-root-28927.rs b/tests/rustdoc/reexport/ice-reexport-crate-root-28927.rs
similarity index 100%
rename from tests/rustdoc/ice-reexport-crate-root-28927.rs
rename to tests/rustdoc/reexport/ice-reexport-crate-root-28927.rs
diff --git a/tests/rustdoc/local-reexport-doc.rs b/tests/rustdoc/reexport/local-reexport-doc.rs
similarity index 100%
rename from tests/rustdoc/local-reexport-doc.rs
rename to tests/rustdoc/reexport/local-reexport-doc.rs
diff --git a/tests/rustdoc/no-compiler-reexport.rs b/tests/rustdoc/reexport/no-compiler-reexport.rs
similarity index 100%
rename from tests/rustdoc/no-compiler-reexport.rs
rename to tests/rustdoc/reexport/no-compiler-reexport.rs
diff --git a/tests/rustdoc/overlapping-reexport-105735-2.rs b/tests/rustdoc/reexport/overlapping-reexport-105735-2.rs
similarity index 100%
rename from tests/rustdoc/overlapping-reexport-105735-2.rs
rename to tests/rustdoc/reexport/overlapping-reexport-105735-2.rs
diff --git a/tests/rustdoc/overlapping-reexport-105735.rs b/tests/rustdoc/reexport/overlapping-reexport-105735.rs
similarity index 100%
rename from tests/rustdoc/overlapping-reexport-105735.rs
rename to tests/rustdoc/reexport/overlapping-reexport-105735.rs
diff --git a/tests/rustdoc/primitive-reexport.rs b/tests/rustdoc/reexport/primitive-reexport.rs
similarity index 100%
rename from tests/rustdoc/primitive-reexport.rs
rename to tests/rustdoc/reexport/primitive-reexport.rs
diff --git a/tests/rustdoc/pub-reexport-of-pub-reexport-46506.rs b/tests/rustdoc/reexport/pub-reexport-of-pub-reexport-46506.rs
similarity index 100%
rename from tests/rustdoc/pub-reexport-of-pub-reexport-46506.rs
rename to tests/rustdoc/reexport/pub-reexport-of-pub-reexport-46506.rs
diff --git a/tests/rustdoc/reexport-attr-merge.rs b/tests/rustdoc/reexport/reexport-attr-merge.rs
similarity index 100%
rename from tests/rustdoc/reexport-attr-merge.rs
rename to tests/rustdoc/reexport/reexport-attr-merge.rs
diff --git a/tests/rustdoc/reexport-cfg.rs b/tests/rustdoc/reexport/reexport-cfg.rs
similarity index 100%
rename from tests/rustdoc/reexport-cfg.rs
rename to tests/rustdoc/reexport/reexport-cfg.rs
diff --git a/tests/rustdoc/reexport-check.rs b/tests/rustdoc/reexport/reexport-check.rs
similarity index 100%
rename from tests/rustdoc/reexport-check.rs
rename to tests/rustdoc/reexport/reexport-check.rs
diff --git a/tests/rustdoc/reexport-dep-foreign-fn.rs b/tests/rustdoc/reexport/reexport-dep-foreign-fn.rs
similarity index 100%
rename from tests/rustdoc/reexport-dep-foreign-fn.rs
rename to tests/rustdoc/reexport/reexport-dep-foreign-fn.rs
diff --git a/tests/rustdoc/reexport-doc-hidden-inside-private.rs b/tests/rustdoc/reexport/reexport-doc-hidden-inside-private.rs
similarity index 100%
rename from tests/rustdoc/reexport-doc-hidden-inside-private.rs
rename to tests/rustdoc/reexport/reexport-doc-hidden-inside-private.rs
diff --git a/tests/rustdoc/reexport-doc-hidden.rs b/tests/rustdoc/reexport/reexport-doc-hidden.rs
similarity index 100%
rename from tests/rustdoc/reexport-doc-hidden.rs
rename to tests/rustdoc/reexport/reexport-doc-hidden.rs
diff --git a/tests/rustdoc/reexport-doc.rs b/tests/rustdoc/reexport/reexport-doc.rs
similarity index 100%
rename from tests/rustdoc/reexport-doc.rs
rename to tests/rustdoc/reexport/reexport-doc.rs
diff --git a/tests/rustdoc/reexport-hidden-macro.rs b/tests/rustdoc/reexport/reexport-hidden-macro.rs
similarity index 100%
rename from tests/rustdoc/reexport-hidden-macro.rs
rename to tests/rustdoc/reexport/reexport-hidden-macro.rs
diff --git a/tests/rustdoc/reexport-macro.rs b/tests/rustdoc/reexport/reexport-macro.rs
similarity index 100%
rename from tests/rustdoc/reexport-macro.rs
rename to tests/rustdoc/reexport/reexport-macro.rs
diff --git a/tests/rustdoc/reexport-of-doc-hidden.rs b/tests/rustdoc/reexport/reexport-of-doc-hidden.rs
similarity index 100%
rename from tests/rustdoc/reexport-of-doc-hidden.rs
rename to tests/rustdoc/reexport/reexport-of-doc-hidden.rs
diff --git a/tests/rustdoc/reexport-of-reexport-108679.rs b/tests/rustdoc/reexport/reexport-of-reexport-108679.rs
similarity index 100%
rename from tests/rustdoc/reexport-of-reexport-108679.rs
rename to tests/rustdoc/reexport/reexport-of-reexport-108679.rs
diff --git a/tests/rustdoc/reexport-stability-tags-deprecated-and-portability.rs b/tests/rustdoc/reexport/reexport-stability-tags-deprecated-and-portability.rs
similarity index 100%
rename from tests/rustdoc/reexport-stability-tags-deprecated-and-portability.rs
rename to tests/rustdoc/reexport/reexport-stability-tags-deprecated-and-portability.rs
diff --git a/tests/rustdoc/reexport-stability-tags-unstable-and-portability.rs b/tests/rustdoc/reexport/reexport-stability-tags-unstable-and-portability.rs
similarity index 100%
rename from tests/rustdoc/reexport-stability-tags-unstable-and-portability.rs
rename to tests/rustdoc/reexport/reexport-stability-tags-unstable-and-portability.rs
diff --git a/tests/rustdoc/reexport-trait-from-hidden-111064-2.rs b/tests/rustdoc/reexport/reexport-trait-from-hidden-111064-2.rs
similarity index 100%
rename from tests/rustdoc/reexport-trait-from-hidden-111064-2.rs
rename to tests/rustdoc/reexport/reexport-trait-from-hidden-111064-2.rs
diff --git a/tests/rustdoc/reexport-trait-from-hidden-111064.rs b/tests/rustdoc/reexport/reexport-trait-from-hidden-111064.rs
similarity index 100%
rename from tests/rustdoc/reexport-trait-from-hidden-111064.rs
rename to tests/rustdoc/reexport/reexport-trait-from-hidden-111064.rs
diff --git a/tests/rustdoc/reexports-of-same-name.rs b/tests/rustdoc/reexport/reexports-of-same-name.rs
similarity index 100%
rename from tests/rustdoc/reexports-of-same-name.rs
rename to tests/rustdoc/reexport/reexports-of-same-name.rs
diff --git a/tests/rustdoc/reexports-priv.rs b/tests/rustdoc/reexport/reexports-priv.rs
similarity index 100%
rename from tests/rustdoc/reexports-priv.rs
rename to tests/rustdoc/reexport/reexports-priv.rs
diff --git a/tests/rustdoc/reexports.rs b/tests/rustdoc/reexport/reexports.rs
similarity index 100%
rename from tests/rustdoc/reexports.rs
rename to tests/rustdoc/reexport/reexports.rs
diff --git a/tests/rustdoc/assoc-type-source-link.rs b/tests/rustdoc/source-code-pages/assoc-type-source-link.rs
similarity index 100%
rename from tests/rustdoc/assoc-type-source-link.rs
rename to tests/rustdoc/source-code-pages/assoc-type-source-link.rs
diff --git a/tests/rustdoc/auxiliary/issue-26606-macro.rs b/tests/rustdoc/source-code-pages/auxiliary/issue-26606-macro.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-26606-macro.rs
rename to tests/rustdoc/source-code-pages/auxiliary/issue-26606-macro.rs
diff --git a/tests/rustdoc/auxiliary/issue-34274.rs b/tests/rustdoc/source-code-pages/auxiliary/issue-34274.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-34274.rs
rename to tests/rustdoc/source-code-pages/auxiliary/issue-34274.rs
diff --git a/tests/rustdoc/auxiliary/source-code-bar.rs b/tests/rustdoc/source-code-pages/auxiliary/source-code-bar.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/source-code-bar.rs
rename to tests/rustdoc/source-code-pages/auxiliary/source-code-bar.rs
diff --git a/tests/rustdoc/auxiliary/source_code.rs b/tests/rustdoc/source-code-pages/auxiliary/source_code.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/source_code.rs
rename to tests/rustdoc/source-code-pages/auxiliary/source_code.rs
diff --git a/tests/rustdoc/auxiliary/src-links-external.rs b/tests/rustdoc/source-code-pages/auxiliary/src-links-external.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/src-links-external.rs
rename to tests/rustdoc/source-code-pages/auxiliary/src-links-external.rs
diff --git a/tests/rustdoc/check-source-code-urls-to-def-std.rs b/tests/rustdoc/source-code-pages/check-source-code-urls-to-def-std.rs
similarity index 100%
rename from tests/rustdoc/check-source-code-urls-to-def-std.rs
rename to tests/rustdoc/source-code-pages/check-source-code-urls-to-def-std.rs
diff --git a/tests/rustdoc/check-source-code-urls-to-def.rs b/tests/rustdoc/source-code-pages/check-source-code-urls-to-def.rs
similarity index 100%
rename from tests/rustdoc/check-source-code-urls-to-def.rs
rename to tests/rustdoc/source-code-pages/check-source-code-urls-to-def.rs
diff --git a/tests/rustdoc/doc-hidden-source.rs b/tests/rustdoc/source-code-pages/doc-hidden-source.rs
similarity index 100%
rename from tests/rustdoc/doc-hidden-source.rs
rename to tests/rustdoc/source-code-pages/doc-hidden-source.rs
diff --git a/tests/rustdoc/html-no-source.rs b/tests/rustdoc/source-code-pages/html-no-source.rs
similarity index 100%
rename from tests/rustdoc/html-no-source.rs
rename to tests/rustdoc/source-code-pages/html-no-source.rs
diff --git a/tests/rustdoc/source-code-highlight.rs b/tests/rustdoc/source-code-pages/source-code-highlight.rs
similarity index 100%
rename from tests/rustdoc/source-code-highlight.rs
rename to tests/rustdoc/source-code-pages/source-code-highlight.rs
diff --git a/tests/rustdoc/source-file.rs b/tests/rustdoc/source-code-pages/source-file.rs
similarity index 100%
rename from tests/rustdoc/source-file.rs
rename to tests/rustdoc/source-code-pages/source-file.rs
diff --git a/tests/rustdoc/source-line-numbers.rs b/tests/rustdoc/source-code-pages/source-line-numbers.rs
similarity index 100%
rename from tests/rustdoc/source-line-numbers.rs
rename to tests/rustdoc/source-code-pages/source-line-numbers.rs
diff --git a/tests/rustdoc/source-version-separator.rs b/tests/rustdoc/source-code-pages/source-version-separator.rs
similarity index 100%
rename from tests/rustdoc/source-version-separator.rs
rename to tests/rustdoc/source-code-pages/source-version-separator.rs
diff --git a/tests/rustdoc/src-link-external-macro-26606.rs b/tests/rustdoc/source-code-pages/src-link-external-macro-26606.rs
similarity index 100%
rename from tests/rustdoc/src-link-external-macro-26606.rs
rename to tests/rustdoc/source-code-pages/src-link-external-macro-26606.rs
diff --git a/tests/rustdoc/src-links-auto-impls.rs b/tests/rustdoc/source-code-pages/src-links-auto-impls.rs
similarity index 100%
rename from tests/rustdoc/src-links-auto-impls.rs
rename to tests/rustdoc/source-code-pages/src-links-auto-impls.rs
diff --git a/tests/rustdoc/src-links-external.rs b/tests/rustdoc/source-code-pages/src-links-external.rs
similarity index 100%
rename from tests/rustdoc/src-links-external.rs
rename to tests/rustdoc/source-code-pages/src-links-external.rs
diff --git a/tests/rustdoc/src-links-implementor-43893.rs b/tests/rustdoc/source-code-pages/src-links-implementor-43893.rs
similarity index 100%
rename from tests/rustdoc/src-links-implementor-43893.rs
rename to tests/rustdoc/source-code-pages/src-links-implementor-43893.rs
diff --git a/tests/rustdoc/src-links-inlined-34274.rs b/tests/rustdoc/source-code-pages/src-links-inlined-34274.rs
similarity index 100%
rename from tests/rustdoc/src-links-inlined-34274.rs
rename to tests/rustdoc/source-code-pages/src-links-inlined-34274.rs
diff --git a/tests/rustdoc/src-links.rs b/tests/rustdoc/source-code-pages/src-links.rs
similarity index 100%
rename from tests/rustdoc/src-links.rs
rename to tests/rustdoc/source-code-pages/src-links.rs
diff --git a/tests/rustdoc/src-links/compiletest-ignore-dir b/tests/rustdoc/source-code-pages/src-links/compiletest-ignore-dir
similarity index 100%
rename from tests/rustdoc/src-links/compiletest-ignore-dir
rename to tests/rustdoc/source-code-pages/src-links/compiletest-ignore-dir
diff --git a/tests/rustdoc/src-links/fizz.rs b/tests/rustdoc/source-code-pages/src-links/fizz.rs
similarity index 100%
rename from tests/rustdoc/src-links/fizz.rs
rename to tests/rustdoc/source-code-pages/src-links/fizz.rs
diff --git a/tests/rustdoc/src-links/mod.rs b/tests/rustdoc/source-code-pages/src-links/mod.rs
similarity index 100%
rename from tests/rustdoc/src-links/mod.rs
rename to tests/rustdoc/source-code-pages/src-links/mod.rs
diff --git a/tests/rustdoc/src-mod-path-absolute-26995.rs b/tests/rustdoc/source-code-pages/src-mod-path-absolute-26995.rs
similarity index 100%
rename from tests/rustdoc/src-mod-path-absolute-26995.rs
rename to tests/rustdoc/source-code-pages/src-mod-path-absolute-26995.rs
diff --git a/tests/rustdoc/version-separator-without-source.rs b/tests/rustdoc/source-code-pages/version-separator-without-source.rs
similarity index 100%
rename from tests/rustdoc/version-separator-without-source.rs
rename to tests/rustdoc/source-code-pages/version-separator-without-source.rs