Skip to content

Commit 433e132

Browse files
BoxyUwUBoxyUwU
committed
bless tests
1 parent db9b8ce commit 433e132

13 files changed

+24
-54
lines changed

‎src/test/ui/feature-gates/feature-gate-const_generics_defaults.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/test/ui/feature-gates/feature-gate-const_generics_defaults.stderr

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/test/ui/generics/issue-59508-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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
33
|
44
LL | pub fn do_things<T, 'a, 'b: 'a>() {
55
| ----^^--^^----- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b: 'a, T>`

‎src/test/ui/generics/issue-59508.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-59508.rs:10:25
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/generics/lifetime-before-type-params.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/lifetime-before-type-params.rs:2:13
33
|
44
LL | fn first<T, 'a, '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>`
66

77
error: lifetime parameters must be declared prior to type parameters
88
--> $DIR/lifetime-before-type-params.rs:4:18
99
|
1010
LL | fn second<'a, T, 'b>() {}
11-
| --------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, T>`
11+
| --------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, T>`
1212

1313
error: lifetime parameters must be declared prior to type parameters
1414
--> $DIR/lifetime-before-type-params.rs:6:16
1515
|
1616
LL | fn third<T, U, 'a>() {}
17-
| -------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
17+
| -------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
1818

1919
error: lifetime parameters must be declared prior to type parameters
2020
--> $DIR/lifetime-before-type-params.rs:8:18
2121
|
2222
LL | fn fourth<'a, T, 'b, U, 'c, V>() {}
23-
| --------^^-----^^---- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, 'c, T, U, V>`
23+
| --------^^-----^^---- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, 'c, T, U, V>`
2424

2525
error: aborting due to 4 previous errors
2626

‎src/test/ui/issues/issue-80512-param-reordering-with-defaults.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-80512-param-reordering-with-defaults.rs:3:18
33
|
44
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 = ()>`
66

77
error: aborting due to previous error
88

‎src/test/ui/missing/missing-items/missing-type-parameter2.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0412]: cannot find type `N` in this scope
2-
--> $DIR/missing-type-parameter2.rs:6:8
2+
--> $DIR/missing-type-parameter2.rs:3:8
33
|
44
LL | struct X<const N: u8>();
55
| ------------------------ similarly named struct `X` defined here
@@ -17,7 +17,7 @@ LL | impl<N> X<N> {}
1717
| +++
1818

1919
error[E0412]: cannot find type `N` in this scope
20-
--> $DIR/missing-type-parameter2.rs:9:28
20+
--> $DIR/missing-type-parameter2.rs:6:28
2121
|
2222
LL | impl<T, const A: u8 = 2> X<N> {}
2323
| - ^
@@ -34,7 +34,7 @@ LL | impl<T, const A: u8 = 2, N> X<N> {}
3434
| +++
3535

3636
error[E0412]: cannot find type `T` in this scope
37-
--> $DIR/missing-type-parameter2.rs:14:20
37+
--> $DIR/missing-type-parameter2.rs:11:20
3838
|
3939
LL | struct X<const N: u8>();
4040
| ------------------------ similarly named struct `X` defined here
@@ -52,7 +52,7 @@ LL | fn foo<T>(_: T) where T: Send {}
5252
| +++
5353

5454
error[E0412]: cannot find type `T` in this scope
55-
--> $DIR/missing-type-parameter2.rs:14:11
55+
--> $DIR/missing-type-parameter2.rs:11:11
5656
|
5757
LL | struct X<const N: u8>();
5858
| ------------------------ similarly named struct `X` defined here
@@ -70,7 +70,7 @@ LL | fn foo<T>(_: T) where T: Send {}
7070
| +++
7171

7272
error[E0412]: cannot find type `A` in this scope
73-
--> $DIR/missing-type-parameter2.rs:18:24
73+
--> $DIR/missing-type-parameter2.rs:15:24
7474
|
7575
LL | struct X<const N: u8>();
7676
| ------------------------ similarly named struct `X` defined here
@@ -88,7 +88,7 @@ LL | fn bar<const N: u8, A>(_: A) {}
8888
| +++
8989

9090
error[E0747]: unresolved item provided when a constant was expected
91-
--> $DIR/missing-type-parameter2.rs:6:8
91+
--> $DIR/missing-type-parameter2.rs:3:8
9292
|
9393
LL | impl X<N> {}
9494
| ^
@@ -99,13 +99,13 @@ LL | impl X<{ N }> {}
9999
| + +
100100

101101
error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
102-
--> $DIR/missing-type-parameter2.rs:9:15
102+
--> $DIR/missing-type-parameter2.rs:6:15
103103
|
104104
LL | impl<T, const A: u8 = 2> X<N> {}
105105
| ^
106106

107107
error[E0747]: unresolved item provided when a constant was expected
108-
--> $DIR/missing-type-parameter2.rs:9:28
108+
--> $DIR/missing-type-parameter2.rs:6:28
109109
|
110110
LL | impl<T, const A: u8 = 2> X<N> {}
111111
| ^

‎src/test/ui/parser/issues/issue-14303-enum.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-14303-enum.rs:1:15
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/parser/issues/issue-14303-fn-def.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-14303-fn-def.rs:1:15
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/parser/issues/issue-14303-impl.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-14303-impl.rs:3:13
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/parser/issues/issue-14303-struct.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-14303-struct.rs:1:17
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/parser/issues/issue-14303-trait.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/issue-14303-trait.rs:1:18
33
|
44
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>`
66

77
error: aborting due to previous error
88

‎src/test/ui/suggestions/suggest-move-lifetimes.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ error: lifetime parameters must be declared prior to type parameters
22
--> $DIR/suggest-move-lifetimes.rs:1:13
33
|
44
LL | struct A<T, 'a> {
5-
| ----^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T>`
5+
| ----^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T>`
66

77
error: lifetime parameters must be declared prior to type parameters
88
--> $DIR/suggest-move-lifetimes.rs:5:13
99
|
1010
LL | struct B<T, 'a, U> {
11-
| ----^^---- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
11+
| ----^^---- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
1212

1313
error: lifetime parameters must be declared prior to type parameters
1414
--> $DIR/suggest-move-lifetimes.rs:10:16
1515
|
1616
LL | struct C<T, U, 'a> {
17-
| -------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, T, U>`
17+
| -------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T, U>`
1818

1919
error: lifetime parameters must be declared prior to type parameters
2020
--> $DIR/suggest-move-lifetimes.rs:15:16
2121
|
2222
LL | struct D<T, U, 'a, 'b, V, 'c> {
23-
| -------^^--^^-----^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, 'b, 'c, T, U, V>`
23+
| -------^^--^^-----^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, 'c, T, U, V>`
2424

2525
error: aborting due to 4 previous errors
2626

0 commit comments

Comments
 (0)