bless tests

BoxyUwU · BoxyUwU · commit 433e13279de9 · 2021-12-10T19:21:25.000Z
diff --git a/src/test/ui/feature-gates/feature-gate-const_generics_defaults.rs b/src/test/ui/feature-gates/feature-gate-const_generics_defaults.rs
diff --git a/src/test/ui/feature-gates/feature-gate-const_generics_defaults.stderr b/src/test/ui/feature-gates/feature-gate-const_generics_defaults.stderr
diff --git a/src/test/ui/generics/issue-59508-1.stderr b/src/test/ui/generics/issue-59508-1.stderr
@@ -1,5 +1,5 @@
 error: lifetime parameters must be declared prior to type parameters
-  --> $DIR/issue-59508-1.rs:11:25
+  --> $DIR/issue-59508-1.rs:10:25
    |
 LL |     pub fn do_things<T, 'a, 'b: 'a>() {
    |                     ----^^--^^----- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b: 'a, T>`
diff --git a/src/test/ui/generics/issue-59508.stderr b/src/test/ui/generics/issue-59508.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-59508.rs:10:25
    |
 LL |     pub fn do_things<T, 'a, 'b: 'a>() {
-   |                     ----^^--^^----- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b: 'a, T>`
+   |                     ----^^--^^----- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b: 'a, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generics/lifetime-before-type-params.stderr b/src/test/ui/generics/lifetime-before-type-params.stderr
@@ -2,25 +2,25 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/lifetime-before-type-params.rs:2:13
    |
 LL | fn first<T, 'a, 'b>() {}
-   |         ----^^--^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |         ----^^--^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/lifetime-before-type-params.rs:4:18
    |
 LL | fn second<'a, T, 'b>() {}
-   |          --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |          --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/lifetime-before-type-params.rs:6:16
    |
 LL | fn third<T, U, 'a>() {}
-   |         -------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
+   |         -------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/lifetime-before-type-params.rs:8:18
    |
 LL | fn fourth<'a, T, 'b, U, 'c, V>() {}
-   |          --------^^-----^^---- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, 'c, T, U, V>`
+   |          --------^^-----^^---- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, 'c, T, U, V>`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/issues/issue-80512-param-reordering-with-defaults.stderr b/src/test/ui/issues/issue-80512-param-reordering-with-defaults.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-80512-param-reordering-with-defaults.rs:3:18
    |
 LL | struct S<T = (), 'a>(&'a T);
-   |         ---------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = ()>`
+   |         ---------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T = ()>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr b/src/test/ui/missing/missing-items/missing-type-parameter2.stderr
@@ -1,5 +1,5 @@
 error[E0412]: cannot find type `N` in this scope
-  --> $DIR/missing-type-parameter2.rs:6:8
+  --> $DIR/missing-type-parameter2.rs:3:8
    |
 LL | struct X<const N: u8>();
    | ------------------------ similarly named struct `X` defined here
@@ -17,7 +17,7 @@ LL | impl<N> X<N> {}
    |     +++
 
 error[E0412]: cannot find type `N` in this scope
-  --> $DIR/missing-type-parameter2.rs:9:28
+  --> $DIR/missing-type-parameter2.rs:6:28
    |
 LL | impl<T, const A: u8 = 2> X<N> {}
    |      -                     ^
@@ -34,7 +34,7 @@ LL | impl<T, const A: u8 = 2, N> X<N> {}
    |                        +++
 
 error[E0412]: cannot find type `T` in this scope
-  --> $DIR/missing-type-parameter2.rs:14:20
+  --> $DIR/missing-type-parameter2.rs:11:20
    |
 LL | struct X<const N: u8>();
    | ------------------------ similarly named struct `X` defined here
@@ -52,7 +52,7 @@ LL | fn foo<T>(_: T) where T: Send {}
    |       +++
 
 error[E0412]: cannot find type `T` in this scope
-  --> $DIR/missing-type-parameter2.rs:14:11
+  --> $DIR/missing-type-parameter2.rs:11:11
    |
 LL | struct X<const N: u8>();
    | ------------------------ similarly named struct `X` defined here
@@ -70,7 +70,7 @@ LL | fn foo<T>(_: T) where T: Send {}
    |       +++
 
 error[E0412]: cannot find type `A` in this scope
-  --> $DIR/missing-type-parameter2.rs:18:24
+  --> $DIR/missing-type-parameter2.rs:15:24
    |
 LL | struct X<const N: u8>();
    | ------------------------ similarly named struct `X` defined here
@@ -88,7 +88,7 @@ LL | fn bar<const N: u8, A>(_: A) {}
    |                   +++
 
 error[E0747]: unresolved item provided when a constant was expected
-  --> $DIR/missing-type-parameter2.rs:6:8
+  --> $DIR/missing-type-parameter2.rs:3:8
    |
 LL | impl X<N> {}
    |        ^
@@ -99,13 +99,13 @@ LL | impl X<{ N }> {}
    |        +   +
 
 error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
-  --> $DIR/missing-type-parameter2.rs:9:15
+  --> $DIR/missing-type-parameter2.rs:6:15
    |
 LL | impl<T, const A: u8 = 2> X<N> {}
    |               ^
 
 error[E0747]: unresolved item provided when a constant was expected
-  --> $DIR/missing-type-parameter2.rs:9:28
+  --> $DIR/missing-type-parameter2.rs:6:28
    |
 LL | impl<T, const A: u8 = 2> X<N> {}
    |                            ^
diff --git a/src/test/ui/parser/issues/issue-14303-enum.stderr b/src/test/ui/parser/issues/issue-14303-enum.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-14303-enum.rs:1:15
    |
 LL | enum X<'a, T, 'b> {
-   |       --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |       --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-14303-fn-def.stderr b/src/test/ui/parser/issues/issue-14303-fn-def.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-14303-fn-def.rs:1:15
    |
 LL | fn foo<'a, T, 'b>(x: &'a T) {}
-   |       --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |       --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-14303-impl.stderr b/src/test/ui/parser/issues/issue-14303-impl.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-14303-impl.rs:3:13
    |
 LL | impl<'a, T, 'b> X<T> {}
-   |     --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |     --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-14303-struct.stderr b/src/test/ui/parser/issues/issue-14303-struct.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-14303-struct.rs:1:17
    |
 LL | struct X<'a, T, 'b> {
-   |         --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |         --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-14303-trait.stderr b/src/test/ui/parser/issues/issue-14303-trait.stderr
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/issue-14303-trait.rs:1:18
    |
 LL | trait Foo<'a, T, 'b> {}
-   |          --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
+   |          --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/suggest-move-lifetimes.stderr b/src/test/ui/suggestions/suggest-move-lifetimes.stderr
@@ -2,25 +2,25 @@ error: lifetime parameters must be declared prior to type parameters
   --> $DIR/suggest-move-lifetimes.rs:1:13
    |
 LL | struct A<T, 'a> {
-   |         ----^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T>`
+   |         ----^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/suggest-move-lifetimes.rs:5:13
    |
 LL | struct B<T, 'a, U> {
-   |         ----^^---- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
+   |         ----^^---- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/suggest-move-lifetimes.rs:10:16
    |
 LL | struct C<T, U, 'a> {
-   |         -------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
+   |         -------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
 
 error: lifetime parameters must be declared prior to type parameters
   --> $DIR/suggest-move-lifetimes.rs:15:16
    |
 LL | struct D<T, U, 'a, 'b, V, 'c> {
-   |         -------^^--^^-----^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, 'c, T, U, V>`
+   |         -------^^--^^-----^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, 'c, T, U, V>`
 
 error: aborting due to 4 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: lifetime parameters must be declared prior to type parameters`
`2`		`- --> $DIR/issue-59508-1.rs:11:25`
	`2`	`+ --> $DIR/issue-59508-1.rs:10:25`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn do_things<T, 'a, 'b: 'a>() {`
`5`	`5`	\| ----^^--^^----- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b: 'a, T>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-59508.rs:10:25`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn do_things<T, 'a, 'b: 'a>() {`
`5`		- \| ----^^--^^----- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b: 'a, T>`
	`5`	+ \| ----^^--^^----- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b: 'a, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-80512-param-reordering-with-defaults.rs:3:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct S<T = (), 'a>(&'a T);`
`5`		- \| ---------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T = ()>`
	`5`	+ \| ---------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T = ()>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-14303-enum.rs:1:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| enum X<'a, T, 'b> {`
`5`		- \| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
	`5`	+ \| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-14303-fn-def.rs:1:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn foo<'a, T, 'b>(x: &'a T) {}`
`5`		- \| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
	`5`	+ \| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-14303-impl.rs:3:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| impl<'a, T, 'b> X<T> {}`
`5`		- \| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
	`5`	+ \| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-14303-struct.rs:1:17`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct X<'a, T, 'b> {`
`5`		- \| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
	`5`	+ \| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters`
`2`	`2`	`--> $DIR/issue-14303-trait.rs:1:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait Foo<'a, T, 'b> {}`
`5`		- \| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
	`5`	+ \| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`