From b5923a95a886588fd40fccd69f1ccca504234194 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Tue, 21 May 2024 21:21:26 -0700 Subject: [PATCH] Move tests into appropriate subdirectories --- .../pub-use-primitive-document-private-items-95633.rs | 1 + tests/rustdoc/{ => inline_cross}/auxiliary/issue-85454.rs | 0 .../auxiliary/reexport-with-anonymous-lifetime-98697.rs} | 0 tests/rustdoc/{ => inline_cross}/qpath-self-85454.rs | 0 .../reexport-with-anonymous-lifetime-98697.rs | 8 ++++---- .../blanket-impl-reexported-trait-94183.rs | 0 .../private-reexport-in-public-api-81141-2.rs | 0 .../private-reexport-in-public-api-81141.rs} | 0 .../private-reexport-in-public-api-generics-81141.rs | 0 .../private-reexport-in-public-api-hidden-81141.rs | 0 .../private-reexport-in-public-api-private-81141.rs | 0 .../reexported-macro-and-macro-export-sidebar-89852.rs} | 0 .../{ => synthetic_auto}/normalize-auto-trait-80233.rs | 0 13 files changed, 5 insertions(+), 4 deletions(-) rename tests/{rustdoc => rustdoc-ui}/pub-use-primitive-document-private-items-95633.rs (93%) rename tests/rustdoc/{ => inline_cross}/auxiliary/issue-85454.rs (100%) rename tests/rustdoc/{auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs => inline_cross/auxiliary/reexport-with-anonymous-lifetime-98697.rs} (100%) rename tests/rustdoc/{ => inline_cross}/qpath-self-85454.rs (100%) rename tests/rustdoc/{ => inline_cross}/reexport-with-anonymous-lifetime-98697.rs (72%) rename tests/rustdoc/{ => inline_local}/blanket-impl-reexported-trait-94183.rs (100%) rename tests/rustdoc/{ => inline_local}/private-reexport-in-public-api-81141-2.rs (100%) rename tests/rustdoc/{private-export-in-public-api-81141.rs => inline_local/private-reexport-in-public-api-81141.rs} (100%) rename tests/rustdoc/{ => inline_local}/private-reexport-in-public-api-generics-81141.rs (100%) rename tests/rustdoc/{ => inline_local}/private-reexport-in-public-api-hidden-81141.rs (100%) rename tests/rustdoc/{ => inline_local}/private-reexport-in-public-api-private-81141.rs (100%) rename tests/rustdoc/{pub-use-exported-macro-89852.rs => inline_local/reexported-macro-and-macro-export-sidebar-89852.rs} (100%) rename tests/rustdoc/{ => synthetic_auto}/normalize-auto-trait-80233.rs (100%) diff --git a/tests/rustdoc/pub-use-primitive-document-private-items-95633.rs b/tests/rustdoc-ui/pub-use-primitive-document-private-items-95633.rs similarity index 93% rename from tests/rustdoc/pub-use-primitive-document-private-items-95633.rs rename to tests/rustdoc-ui/pub-use-primitive-document-private-items-95633.rs index 7f612a0b60ae4..d53a67cde8b43 100644 --- a/tests/rustdoc/pub-use-primitive-document-private-items-95633.rs +++ b/tests/rustdoc-ui/pub-use-primitive-document-private-items-95633.rs @@ -1,3 +1,4 @@ +//@ check-pass //@ compile-flags: --document-private-items // This ensures that no ICE is triggered when rustdoc is run on this code. diff --git a/tests/rustdoc/auxiliary/issue-85454.rs b/tests/rustdoc/inline_cross/auxiliary/issue-85454.rs similarity index 100% rename from tests/rustdoc/auxiliary/issue-85454.rs rename to tests/rustdoc/inline_cross/auxiliary/issue-85454.rs diff --git a/tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs b/tests/rustdoc/inline_cross/auxiliary/reexport-with-anonymous-lifetime-98697.rs similarity index 100% rename from tests/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs rename to tests/rustdoc/inline_cross/auxiliary/reexport-with-anonymous-lifetime-98697.rs diff --git a/tests/rustdoc/qpath-self-85454.rs b/tests/rustdoc/inline_cross/qpath-self-85454.rs similarity index 100% rename from tests/rustdoc/qpath-self-85454.rs rename to tests/rustdoc/inline_cross/qpath-self-85454.rs diff --git a/tests/rustdoc/reexport-with-anonymous-lifetime-98697.rs b/tests/rustdoc/inline_cross/reexport-with-anonymous-lifetime-98697.rs similarity index 72% rename from tests/rustdoc/reexport-with-anonymous-lifetime-98697.rs rename to tests/rustdoc/inline_cross/reexport-with-anonymous-lifetime-98697.rs index 545af512d3d02..fe6e5a39c8106 100644 --- a/tests/rustdoc/reexport-with-anonymous-lifetime-98697.rs +++ b/tests/rustdoc/inline_cross/reexport-with-anonymous-lifetime-98697.rs @@ -1,4 +1,4 @@ -//@ aux-build:issue-98697-reexport-with-anonymous-lifetime.rs +//@ aux-build:reexport-with-anonymous-lifetime-98697.rs //@ ignore-cross-compile #![crate_name = "foo"] @@ -7,12 +7,12 @@ // // https://github.com/rust-lang/rust/issues/98697 -extern crate issue_98697_reexport_with_anonymous_lifetime; +extern crate reexport_with_anonymous_lifetime_98697; // @has foo/fn.repro.html '//pre[@class="rust item-decl"]/code' 'fn repro()where F: Fn(&str)' // @!has foo/fn.repro.html '//pre[@class="rust item-decl"]/code' 'for<' -pub use issue_98697_reexport_with_anonymous_lifetime::repro; +pub use reexport_with_anonymous_lifetime_98697::repro; // @has foo/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header"]' 'impl MyTrait<&Extra> for Extra' // @!has foo/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header"]' 'impl<' -pub use issue_98697_reexport_with_anonymous_lifetime::Extra; +pub use reexport_with_anonymous_lifetime_98697::Extra; diff --git a/tests/rustdoc/blanket-impl-reexported-trait-94183.rs b/tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs similarity index 100% rename from tests/rustdoc/blanket-impl-reexported-trait-94183.rs rename to tests/rustdoc/inline_local/blanket-impl-reexported-trait-94183.rs diff --git a/tests/rustdoc/private-reexport-in-public-api-81141-2.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs similarity index 100% rename from tests/rustdoc/private-reexport-in-public-api-81141-2.rs rename to tests/rustdoc/inline_local/private-reexport-in-public-api-81141-2.rs diff --git a/tests/rustdoc/private-export-in-public-api-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs similarity index 100% rename from tests/rustdoc/private-export-in-public-api-81141.rs rename to tests/rustdoc/inline_local/private-reexport-in-public-api-81141.rs diff --git a/tests/rustdoc/private-reexport-in-public-api-generics-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs similarity index 100% rename from tests/rustdoc/private-reexport-in-public-api-generics-81141.rs rename to tests/rustdoc/inline_local/private-reexport-in-public-api-generics-81141.rs diff --git a/tests/rustdoc/private-reexport-in-public-api-hidden-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs similarity index 100% rename from tests/rustdoc/private-reexport-in-public-api-hidden-81141.rs rename to tests/rustdoc/inline_local/private-reexport-in-public-api-hidden-81141.rs diff --git a/tests/rustdoc/private-reexport-in-public-api-private-81141.rs b/tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs similarity index 100% rename from tests/rustdoc/private-reexport-in-public-api-private-81141.rs rename to tests/rustdoc/inline_local/private-reexport-in-public-api-private-81141.rs diff --git a/tests/rustdoc/pub-use-exported-macro-89852.rs b/tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs similarity index 100% rename from tests/rustdoc/pub-use-exported-macro-89852.rs rename to tests/rustdoc/inline_local/reexported-macro-and-macro-export-sidebar-89852.rs diff --git a/tests/rustdoc/normalize-auto-trait-80233.rs b/tests/rustdoc/synthetic_auto/normalize-auto-trait-80233.rs similarity index 100% rename from tests/rustdoc/normalize-auto-trait-80233.rs rename to tests/rustdoc/synthetic_auto/normalize-auto-trait-80233.rs