diff options
| author | Michael Howell <michael@notriddle.com> | 2022-06-16 09:50:57 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2022-07-17 16:32:06 -0700 |
| commit | 1169832f2ff1ce740dc3d68de2df3745ec4e1aef (patch) | |
| tree | 787992af670a5860306399e1fdc94e5818dbc0fc /src/test | |
| parent | 263edd43c5255084292329423c61a9d69715ebfa (diff) | |
| download | rust-1169832f2ff1ce740dc3d68de2df3745ec4e1aef.tar.gz rust-1169832f2ff1ce740dc3d68de2df3745ec4e1aef.zip | |
rustdoc: extend `#[doc(tuple_variadic)]` to fn pointers
The attribute is also renamed `fake_variadic`.
Diffstat (limited to 'src/test')
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/rustdoc-ui/tuple-variadic-check.rs b/src/test/rustdoc-ui/tuple-variadic-check.rs index 11ce2dbe280..505de53481f 100644 --- a/src/test/rustdoc-ui/tuple-variadic-check.rs +++ b/src/test/rustdoc-ui/tuple-variadic-check.rs @@ -3,13 +3,13 @@ trait Mine {} // This one is fine -#[doc(tuple_variadic)] +#[doc(fake_variadic)] impl<T> Mine for (T,) {} trait Mine2 {} // This one is not -#[doc(tuple_variadic)] //~ ERROR +#[doc(fake_variadic)] //~ ERROR impl<T, U> Mine for (T,U) {} fn main() {} diff --git a/src/test/rustdoc-ui/tuple-variadic-check.stderr b/src/test/rustdoc-ui/tuple-variadic-check.stderr index 358d06d6a42..d127fb858d1 100644 --- a/src/test/rustdoc-ui/tuple-variadic-check.stderr +++ b/src/test/rustdoc-ui/tuple-variadic-check.stderr @@ -1,8 +1,8 @@ -error: `#[doc(tuple_variadic)]` must be used on the first of a set of tuple trait impls with varying arity +error: `#[doc(fake_variadic)]` must be used on the first of a set of tuple or fn pointer trait impls with varying arity --> $DIR/tuple-variadic-check.rs:12:7 | -LL | #[doc(tuple_variadic)] - | ^^^^^^^^^^^^^^ +LL | #[doc(fake_variadic)] + | ^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/rustdoc/primitive-tuple-auto-trait.rs b/src/test/rustdoc/primitive-tuple-auto-trait.rs index 71b0b077009..a2fbbf078d5 100644 --- a/src/test/rustdoc/primitive-tuple-auto-trait.rs +++ b/src/test/rustdoc/primitive-tuple-auto-trait.rs @@ -16,7 +16,7 @@ // @has - '//h2[@id="trait-implementations-1"]' 'Trait implementations' /// # Trait implementations /// -/// This header is hard-coded in the HTML format linking for `#[doc(tuple_variadics)]`. +/// This header is hard-coded in the HTML format linking for `#[doc(fake_variadics)]`. /// To make sure it gets linked correctly, we need to make sure the hardcoded anchor /// in the code matches what rustdoc generates for the header. mod tuple_prim {} diff --git a/src/test/rustdoc/primitive-tuple-variadic.rs b/src/test/rustdoc/primitive-tuple-variadic.rs index 4fd6254f674..db7cfd60c71 100644 --- a/src/test/rustdoc/primitive-tuple-variadic.rs +++ b/src/test/rustdoc/primitive-tuple-variadic.rs @@ -7,12 +7,12 @@ pub trait Foo {} // @has foo/trait.Foo.html // @has - '//section[@id="impl-Foo-for-(T%2C)"]/h3' 'impl<T> Foo for (T₁, T₂, …, Tₙ)' -#[doc(tuple_variadic)] +#[doc(fake_variadic)] impl<T> Foo for (T,) {} pub trait Bar {} // @has foo/trait.Bar.html // @has - '//section[@id="impl-Bar-for-(U%2C)"]/h3' 'impl<U: Foo> Bar for (U₁, U₂, …, Uₙ)' -#[doc(tuple_variadic)] +#[doc(fake_variadic)] impl<U: Foo> Bar for (U,) {} diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs index 6a144412d07..58306a4cfc9 100644 --- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs +++ b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs @@ -4,7 +4,7 @@ mod foo {} trait Mine {} -#[doc(tuple_variadic)] //~ ERROR: `#[doc(tuple_variadic)]` is meant for internal use only +#[doc(fake_variadic)] //~ ERROR: `#[doc(fake_variadic)]` is meant for internal use only impl<T> Mine for (T,) {} fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr index 9fe08afd4f0..c4272a2c04c 100644 --- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr @@ -7,11 +7,11 @@ LL | #[doc(keyword = "match")] = note: see issue #90418 <https://github.com/rust-lang/rust/issues/90418> for more information = help: add `#![feature(rustdoc_internals)]` to the crate attributes to enable -error[E0658]: `#[doc(tuple_variadic)]` is meant for internal use only +error[E0658]: `#[doc(fake_variadic)]` is meant for internal use only --> $DIR/feature-gate-rustdoc_internals.rs:7:1 | -LL | #[doc(tuple_variadic)] - | ^^^^^^^^^^^^^^^^^^^^^^ +LL | #[doc(fake_variadic)] + | ^^^^^^^^^^^^^^^^^^^^^ | = note: see issue #90418 <https://github.com/rust-lang/rust/issues/90418> for more information = help: add `#![feature(rustdoc_internals)]` to the crate attributes to enable |
