diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2024-09-13 19:38:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 19:38:01 +1000 |
| commit | 1c23c8ba0cd879832ea038c89b919f7ebf9b0bad (patch) | |
| tree | 489549632ad843026a257193051982af6dfef3a4 | |
| parent | 26bda05938cddffb3bff8dba9ceb4b0192b37982 (diff) | |
| parent | 48c7e444b15823342e8482a7c6590bca6d83e691 (diff) | |
| download | rust-1c23c8ba0cd879832ea038c89b919f7ebf9b0bad.tar.gz rust-1c23c8ba0cd879832ea038c89b919f7ebf9b0bad.zip | |
Rollup merge of #130287 - notriddle:notriddle/issue-d, r=jieyouxu
rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 9) Follow up * https://github.com/rust-lang/rust/pull/116214 * https://github.com/rust-lang/rust/pull/116432 * https://github.com/rust-lang/rust/pull/116824 * https://github.com/rust-lang/rust/pull/118105 * https://github.com/rust-lang/rust/pull/119561 * https://github.com/rust-lang/rust/pull/123574 * https://github.com/rust-lang/rust/pull/125382 * https://github.com/rust-lang/rust/pull/127671 As always, it's easier to review the commits one at a time. Don't use the Files Changed tab. It's confusing.
| -rw-r--r-- | tests/rustdoc-ui/associated-constant-not-allowed-102467.rs (renamed from tests/rustdoc-ui/issue-102467.rs) | 0 | ||||
| -rw-r--r-- | tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr (renamed from tests/rustdoc-ui/issue-102467.stderr) | 4 | ||||
| -rw-r--r-- | tests/rustdoc-ui/private-type-cycle-110629.rs (renamed from tests/rustdoc-ui/issue-110629-private-type-cycle.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc-ui/private-type-cycle-dyn-110629.rs (renamed from tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs) | 2 | ||||
| -rw-r--r-- | tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr (renamed from tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr) | 4 | ||||
| -rw-r--r-- | tests/rustdoc/anonymous-reexport-108931.rs (renamed from tests/rustdoc/issue-108931-anonymous-reexport.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/crate-doc-hidden-109695.rs (renamed from tests/rustdoc/issue-109695-crate-doc-hidden.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/deref/sidebar-links-deref-100679.rs (renamed from tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/doc-hidden-reexports-109449.rs (renamed from tests/rustdoc/issue-109449-doc-hidden-reexports.rs) | 0 | ||||
| -rw-r--r-- | tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs (renamed from tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs (renamed from tests/rustdoc/duplicate_impls/issue-33054.rs) | 6 | ||||
| -rw-r--r-- | tests/rustdoc/empty-tuple-struct-118180.rs (renamed from tests/rustdoc/issue-118180-empty-tuple-struct.rs) | 7 | ||||
| -rw-r--r-- | tests/rustdoc/enum-non-exhaustive-108925.rs (renamed from tests/rustdoc/issue-108925.rs) | 5 | ||||
| -rw-r--r-- | tests/rustdoc/file-creation-111249.rs (renamed from tests/rustdoc/issue-111249-file-creation.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs (renamed from tests/rustdoc/generic-associated-types/issue-94683.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/generic-associated-types/gat-linkification-109488.rs (renamed from tests/rustdoc/generic-associated-types/issue-109488.rs) | 4 | ||||
| -rw-r--r-- | tests/rustdoc/inner-private-110422.rs (renamed from tests/rustdoc/issue-110422-inner-private.rs) | 0 | ||||
| -rw-r--r-- | tests/rustdoc/macro-const-display-115295.rs (renamed from tests/rustdoc/issue-115295-macro-const-display.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/missing-private-inlining-109258.rs (renamed from tests/rustdoc/issue-109258-missing-private-inlining.rs) | 0 | ||||
| -rw-r--r-- | tests/rustdoc/private-type-cycle-110629.rs (renamed from tests/rustdoc/issue-110629-private-type-cycle.rs) | 4 | ||||
| -rw-r--r-- | tests/rustdoc/reexport-trait-from-hidden-111064-2.rs (renamed from tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs) | 1 | ||||
| -rw-r--r-- | tests/rustdoc/reexport-trait-from-hidden-111064.rs (renamed from tests/rustdoc/issue-111064-reexport-trait-from-hidden.rs) | 0 |
22 files changed, 34 insertions, 11 deletions
diff --git a/tests/rustdoc-ui/issue-102467.rs b/tests/rustdoc-ui/associated-constant-not-allowed-102467.rs index d9bd48103d2..d9bd48103d2 100644 --- a/tests/rustdoc-ui/issue-102467.rs +++ b/tests/rustdoc-ui/associated-constant-not-allowed-102467.rs diff --git a/tests/rustdoc-ui/issue-102467.stderr b/tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr index 5fcdba782e7..5c8f08afe7a 100644 --- a/tests/rustdoc-ui/issue-102467.stderr +++ b/tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr @@ -1,5 +1,5 @@ error[E0229]: associated item constraints are not allowed here - --> $DIR/issue-102467.rs:7:17 + --> $DIR/associated-constant-not-allowed-102467.rs:7:17 | LL | type A: S<C<X = 0i32> = 34>; | ^^^^^^^^ associated item constraint not allowed here @@ -11,7 +11,7 @@ LL + type A: S<C = 34>; | error[E0229]: associated item constraints are not allowed here - --> $DIR/issue-102467.rs:7:17 + --> $DIR/associated-constant-not-allowed-102467.rs:7:17 | LL | type A: S<C<X = 0i32> = 34>; | ^^^^^^^^ associated item constraint not allowed here diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle.rs b/tests/rustdoc-ui/private-type-cycle-110629.rs index b31b9d03e7c..fecb0239a3c 100644 --- a/tests/rustdoc-ui/issue-110629-private-type-cycle.rs +++ b/tests/rustdoc-ui/private-type-cycle-110629.rs @@ -1,4 +1,5 @@ //@ check-pass +// https://github.com/rust-lang/rust/issues/110629 #![feature(type_alias_impl_trait)] diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs b/tests/rustdoc-ui/private-type-cycle-dyn-110629.rs index c920a815fda..91bf64cdc56 100644 --- a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs +++ b/tests/rustdoc-ui/private-type-cycle-dyn-110629.rs @@ -1,3 +1,5 @@ +// https://github.com/rust-lang/rust/issues/110629 + type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>; //~^ ERROR cycle detected when expanding type alias diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr b/tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr index 9394b019e11..6ee7e4b781c 100644 --- a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr +++ b/tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when expanding type alias `Bar` - --> $DIR/issue-110629-private-type-cycle-dyn.rs:1:38 + --> $DIR/private-type-cycle-dyn-110629.rs:3:38 | LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>; | ^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>; = help: consider using a struct, enum, or union instead to break the cycle = help: see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information note: cycle used when checking that `Bar` is well-formed - --> $DIR/issue-110629-private-type-cycle-dyn.rs:1:1 + --> $DIR/private-type-cycle-dyn-110629.rs:3:1 | LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>; | ^^^^^^^^^^^^^^^^ diff --git a/tests/rustdoc/issue-108931-anonymous-reexport.rs b/tests/rustdoc/anonymous-reexport-108931.rs index 300ee3baf05..f4cc7f12396 100644 --- a/tests/rustdoc/issue-108931-anonymous-reexport.rs +++ b/tests/rustdoc/anonymous-reexport-108931.rs @@ -1,4 +1,5 @@ // Ensuring that anonymous re-exports are always inlined. +// https://github.com/rust-lang/rust/issues/108931 #![crate_name = "foo"] diff --git a/tests/rustdoc/issue-109695-crate-doc-hidden.rs b/tests/rustdoc/crate-doc-hidden-109695.rs index 8dc077d1565..fc8361ab297 100644 --- a/tests/rustdoc/issue-109695-crate-doc-hidden.rs +++ b/tests/rustdoc/crate-doc-hidden-109695.rs @@ -1,5 +1,6 @@ // This test ensures that even if the crate module is `#[doc(hidden)]`, the file // is generated. +// https://github.com/rust-lang/rust/issues/109695 //@ has 'foo/index.html' //@ has 'foo/all.html' diff --git a/tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs b/tests/rustdoc/deref/sidebar-links-deref-100679.rs index 44ac08de0b8..d0c37529487 100644 --- a/tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs +++ b/tests/rustdoc/deref/sidebar-links-deref-100679.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/100679 #![crate_name="foo"] pub struct Vec; diff --git a/tests/rustdoc/issue-109449-doc-hidden-reexports.rs b/tests/rustdoc/doc-hidden-reexports-109449.rs index cc3679f6196..cc3679f6196 100644 --- a/tests/rustdoc/issue-109449-doc-hidden-reexports.rs +++ b/tests/rustdoc/doc-hidden-reexports-109449.rs diff --git a/tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs b/tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs index c083d9495f4..76b25127a9c 100644 --- a/tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs +++ b/tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs @@ -1,5 +1,6 @@ //@ aux-build: issue-113982-doc_auto_cfg-reexport-foreign.rs +// https://github.com/rust-lang/rust/issues/113982 #![feature(no_core, doc_auto_cfg)] #![no_core] #![crate_name = "foo"] diff --git a/tests/rustdoc/duplicate_impls/issue-33054.rs b/tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs index 24ff30668cf..511a40c38a0 100644 --- a/tests/rustdoc/duplicate_impls/issue-33054.rs +++ b/tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs @@ -1,11 +1,13 @@ // ignore-tidy-linelength +// https://github.com/rust-lang/rust/issues/100679 +#![crate_name="foo"] -//@ has issue_33054/impls/struct.Foo.html +//@ has foo/impls/struct.Foo.html //@ has - '//h3[@class="code-header"]' 'impl Foo' //@ has - '//h3[@class="code-header"]' 'impl Bar for Foo' //@ count - '//*[@id="trait-implementations-list"]//*[@class="impl"]' 1 //@ count - '//*[@id="main-content"]/div[@id="implementations-list"]/details/summary/*[@class="impl"]' 1 -//@ has issue_33054/impls/bar/trait.Bar.html +//@ has foo/impls/bar/trait.Bar.html //@ has - '//h3[@class="code-header"]' 'impl Bar for Foo' //@ count - '//*[@class="struct"]' 1 pub mod impls; diff --git a/tests/rustdoc/issue-118180-empty-tuple-struct.rs b/tests/rustdoc/empty-tuple-struct-118180.rs index 2cd1df27b2b..614857ad5ae 100644 --- a/tests/rustdoc/issue-118180-empty-tuple-struct.rs +++ b/tests/rustdoc/empty-tuple-struct-118180.rs @@ -1,9 +1,12 @@ -//@ has issue_118180_empty_tuple_struct/enum.Enum.html +// https://github.com/rust-lang/rust/issues/118180 +#![crate_name="foo"] + +//@ has foo/enum.Enum.html pub enum Enum { //@ has - '//*[@id="variant.Empty"]//h3' 'Empty()' Empty(), } -//@ has issue_118180_empty_tuple_struct/struct.Empty.html +//@ has foo/struct.Empty.html //@ has - '//pre/code' 'Empty()' pub struct Empty(); diff --git a/tests/rustdoc/issue-108925.rs b/tests/rustdoc/enum-non-exhaustive-108925.rs index a332771616d..ea2462449d2 100644 --- a/tests/rustdoc/issue-108925.rs +++ b/tests/rustdoc/enum-non-exhaustive-108925.rs @@ -1,4 +1,7 @@ -//@ has issue_108925/enum.MyThing.html +// https://github.com/rust-lang/rust/issues/108925 +#![crate_name="foo"] + +//@ has foo/enum.MyThing.html //@ has - '//code' 'Shown' //@ !has - '//code' 'NotShown' //@ !has - '//code' '// some variants omitted' diff --git a/tests/rustdoc/issue-111249-file-creation.rs b/tests/rustdoc/file-creation-111249.rs index 89a25aef97d..a6522d682f1 100644 --- a/tests/rustdoc/issue-111249-file-creation.rs +++ b/tests/rustdoc/file-creation-111249.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/111249 #![crate_name = "foo"] #![feature(no_core)] #![no_core] diff --git a/tests/rustdoc/generic-associated-types/issue-94683.rs b/tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs index 19a1e9d448e..c1cacaf3f11 100644 --- a/tests/rustdoc/generic-associated-types/issue-94683.rs +++ b/tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/94683 #![crate_name = "foo"] pub trait Trait { diff --git a/tests/rustdoc/generic-associated-types/issue-109488.rs b/tests/rustdoc/generic-associated-types/gat-linkification-109488.rs index 12f8988f520..be55a10b403 100644 --- a/tests/rustdoc/generic-associated-types/issue-109488.rs +++ b/tests/rustdoc/generic-associated-types/gat-linkification-109488.rs @@ -1,8 +1,10 @@ // Make sure that we escape the arguments of the GAT projection even if we fail to compute // the href of the corresponding trait (in this case it is private). // Further, test that we also linkify the GAT arguments. +// https://github.com/rust-lang/rust/issues/94683 +#![crate_name="foo"] -//@ has 'issue_109488/type.A.html' +//@ has 'foo/type.A.html' //@ has - '//pre[@class="rust item-decl"]' '<S as Tr>::P<Option<i32>>' //@ has - '//pre[@class="rust item-decl"]//a[@class="enum"]/@href' '{{channel}}/core/option/enum.Option.html' pub type A = <S as Tr>::P<Option<i32>>; diff --git a/tests/rustdoc/issue-110422-inner-private.rs b/tests/rustdoc/inner-private-110422.rs index 31e28676879..31e28676879 100644 --- a/tests/rustdoc/issue-110422-inner-private.rs +++ b/tests/rustdoc/inner-private-110422.rs diff --git a/tests/rustdoc/issue-115295-macro-const-display.rs b/tests/rustdoc/macro-const-display-115295.rs index 0dadb76ae5c..445b47e0b24 100644 --- a/tests/rustdoc/issue-115295-macro-const-display.rs +++ b/tests/rustdoc/macro-const-display-115295.rs @@ -1,3 +1,4 @@ +// https://github.com/rust-lang/rust/issues/115295 #![crate_name = "foo"] //@ has foo/trait.Trait.html diff --git a/tests/rustdoc/issue-109258-missing-private-inlining.rs b/tests/rustdoc/missing-private-inlining-109258.rs index 7f010f160c4..7f010f160c4 100644 --- a/tests/rustdoc/issue-109258-missing-private-inlining.rs +++ b/tests/rustdoc/missing-private-inlining-109258.rs diff --git a/tests/rustdoc/issue-110629-private-type-cycle.rs b/tests/rustdoc/private-type-cycle-110629.rs index 22ea721fd44..e2376809697 100644 --- a/tests/rustdoc/issue-110629-private-type-cycle.rs +++ b/tests/rustdoc/private-type-cycle-110629.rs @@ -1,10 +1,12 @@ //@ compile-flags: --document-private-items +// https://github.com/rust-lang/rust/issues/110629 +#![crate_name="foo"] #![feature(type_alias_impl_trait)] type Bar<'a, 'b> = impl PartialEq<Bar<'a, 'b>> + std::fmt::Debug; -//@ has issue_110629_private_type_cycle/type.Bar.html +//@ has foo/type.Bar.html //@ has - '//pre[@class="rust item-decl"]' \ // "pub(crate) type Bar<'a, 'b> = impl PartialEq<Bar<'a, 'b>> + Debug;" diff --git a/tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs b/tests/rustdoc/reexport-trait-from-hidden-111064-2.rs index 4b80f508e7f..2b21f9862b4 100644 --- a/tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs +++ b/tests/rustdoc/reexport-trait-from-hidden-111064-2.rs @@ -1,3 +1,4 @@ +// Regression test for <https://github.com/rust-lang/rust/issues/111064>. #![feature(no_core)] #![no_core] #![crate_name = "foo"] diff --git a/tests/rustdoc/issue-111064-reexport-trait-from-hidden.rs b/tests/rustdoc/reexport-trait-from-hidden-111064.rs index 84ec818ef33..84ec818ef33 100644 --- a/tests/rustdoc/issue-111064-reexport-trait-from-hidden.rs +++ b/tests/rustdoc/reexport-trait-from-hidden-111064.rs |
