Skip to content

Commit 1296fc2

Browse files
AprilNEAAprilNEA
committed
Update .stderr files for line number changes
1 parent 4ac59b5 commit 1296fc2

4 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎tests/ui/associated-consts/assoc-const-eq-bound-var-in-ty-not-wf.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: higher-ranked subtype error
2-
--> $DIR/assoc-const-eq-bound-var-in-ty-not-wf.rs:21:13
2+
--> $DIR/assoc-const-eq-bound-var-in-ty-not-wf.rs:20:13
33
|
44
LL | K = const { () }
55
| ^^^^^^^^^^^^
66

77
error: higher-ranked subtype error
8-
--> $DIR/assoc-const-eq-bound-var-in-ty-not-wf.rs:21:13
8+
--> $DIR/assoc-const-eq-bound-var-in-ty-not-wf.rs:20:13
99
|
1010
LL | K = const { () }
1111
| ^^^^^^^^^^^^

‎tests/ui/associated-consts/assoc-const-eq-param-in-ty.stderr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: the type of the associated constant `K` must not depend on generic parameters
2-
--> $DIR/assoc-const-eq-param-in-ty.rs:22:29
2+
--> $DIR/assoc-const-eq-param-in-ty.rs:21:29
33
|
44
LL | fn take0<'r, A: 'r + ConstParamTy_, const Q: usize>(
55
| -- the lifetime parameter `'r` is defined here
@@ -10,7 +10,7 @@ LL | _: impl Trait<'r, A, Q, K = const { loop {} }>
1010
= note: `K` has type `&'r [A; Q]`
1111

1212
error: the type of the associated constant `K` must not depend on generic parameters
13-
--> $DIR/assoc-const-eq-param-in-ty.rs:22:29
13+
--> $DIR/assoc-const-eq-param-in-ty.rs:21:29
1414
|
1515
LL | fn take0<'r, A: 'r + ConstParamTy_, const Q: usize>(
1616
| - the type parameter `A` is defined here
@@ -21,7 +21,7 @@ LL | _: impl Trait<'r, A, Q, K = const { loop {} }>
2121
= note: `K` has type `&'r [A; Q]`
2222

2323
error: the type of the associated constant `K` must not depend on generic parameters
24-
--> $DIR/assoc-const-eq-param-in-ty.rs:22:29
24+
--> $DIR/assoc-const-eq-param-in-ty.rs:21:29
2525
|
2626
LL | fn take0<'r, A: 'r + ConstParamTy_, const Q: usize>(
2727
| - the const parameter `Q` is defined here
@@ -32,7 +32,7 @@ LL | _: impl Trait<'r, A, Q, K = const { loop {} }>
3232
= note: `K` has type `&'r [A; Q]`
3333

3434
error: the type of the associated constant `SELF` must not depend on `impl Trait`
35-
--> $DIR/assoc-const-eq-param-in-ty.rs:39:26
35+
--> $DIR/assoc-const-eq-param-in-ty.rs:38:26
3636
|
3737
LL | fn take1(_: impl Project<SELF = const {}>) {}
3838
| -------------^^^^------------
@@ -41,7 +41,7 @@ LL | fn take1(_: impl Project<SELF = const {}>) {}
4141
| the `impl Trait` is specified here
4242

4343
error: the type of the associated constant `SELF` must not depend on generic parameters
44-
--> $DIR/assoc-const-eq-param-in-ty.rs:44:21
44+
--> $DIR/assoc-const-eq-param-in-ty.rs:43:21
4545
|
4646
LL | fn take2<P: Project<SELF = const {}>>(_: P) {}
4747
| - ^^^^ its type must not depend on the type parameter `P`
@@ -51,7 +51,7 @@ LL | fn take2<P: Project<SELF = const {}>>(_: P) {}
5151
= note: `SELF` has type `P`
5252

5353
error: the type of the associated constant `K` must not depend on generic parameters
54-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
54+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
5555
|
5656
LL | trait Iface<'r>: ConstParamTy_ {
5757
| -- the lifetime parameter `'r` is defined here
@@ -62,15 +62,15 @@ LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
6262
= note: `K` has type `&'r [Self; Q]`
6363

6464
error: the type of the associated constant `K` must not depend on `Self`
65-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
65+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
6666
|
6767
LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
6868
| ^ its type must not depend on `Self`
6969
|
7070
= note: `K` has type `&'r [Self; Q]`
7171

7272
error: the type of the associated constant `K` must not depend on generic parameters
73-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
73+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
7474
|
7575
LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
7676
| - ^ its type must not depend on the const parameter `Q`
@@ -80,7 +80,7 @@ LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
8080
= note: `K` has type `&'r [Self; Q]`
8181

8282
error: the type of the associated constant `K` must not depend on generic parameters
83-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
83+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
8484
|
8585
LL | trait Iface<'r>: ConstParamTy_ {
8686
| -- the lifetime parameter `'r` is defined here
@@ -92,7 +92,7 @@ LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
9292
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
9393

9494
error: the type of the associated constant `K` must not depend on `Self`
95-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
95+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
9696
|
9797
LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
9898
| ^ its type must not depend on `Self`
@@ -101,7 +101,7 @@ LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
101101
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
102102

103103
error: the type of the associated constant `K` must not depend on generic parameters
104-
--> $DIR/assoc-const-eq-param-in-ty.rs:53:52
104+
--> $DIR/assoc-const-eq-param-in-ty.rs:52:52
105105
|
106106
LL | type Assoc<const Q: usize>: Trait<'r, Self, Q, K = const { loop {} }>
107107
| - ^ its type must not depend on the const parameter `Q`

‎tests/ui/associated-type-bounds/duplicate-bound-err.stderr‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0282]: type annotations needed
2-
--> $DIR/duplicate-bound-err.rs:15:5
2+
--> $DIR/duplicate-bound-err.rs:14:5
33
|
44
LL | iter::empty()
55
| ^^^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `empty`
@@ -10,7 +10,7 @@ LL | iter::empty::<T>()
1010
| +++++
1111

1212
error[E0282]: type annotations needed
13-
--> $DIR/duplicate-bound-err.rs:19:5
13+
--> $DIR/duplicate-bound-err.rs:18:5
1414
|
1515
LL | iter::empty()
1616
| ^^^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `empty`
@@ -21,7 +21,7 @@ LL | iter::empty::<T>()
2121
| +++++
2222

2323
error[E0282]: type annotations needed
24-
--> $DIR/duplicate-bound-err.rs:23:5
24+
--> $DIR/duplicate-bound-err.rs:22:5
2525
|
2626
LL | iter::empty()
2727
| ^^^^^^^^^^^ cannot infer type of the type parameter `T` declared on the function `empty`
@@ -32,55 +32,55 @@ LL | iter::empty::<T>()
3232
| +++++
3333

3434
error: unconstrained opaque type
35-
--> $DIR/duplicate-bound-err.rs:27:51
35+
--> $DIR/duplicate-bound-err.rs:26:51
3636
|
3737
LL | type Tait1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
3838
| ^^^^^^^^^
3939
|
4040
= note: `Tait1` must be used in combination with a concrete type within the same crate
4141

4242
error: unconstrained opaque type
43-
--> $DIR/duplicate-bound-err.rs:29:51
43+
--> $DIR/duplicate-bound-err.rs:28:51
4444
|
4545
LL | type Tait2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
4646
| ^^^^^^^^^
4747
|
4848
= note: `Tait2` must be used in combination with a concrete type within the same crate
4949

5050
error: unconstrained opaque type
51-
--> $DIR/duplicate-bound-err.rs:31:57
51+
--> $DIR/duplicate-bound-err.rs:30:57
5252
|
5353
LL | type Tait3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
5454
| ^^^^^^^^^
5555
|
5656
= note: `Tait3` must be used in combination with a concrete type within the same crate
5757

5858
error: unconstrained opaque type
59-
--> $DIR/duplicate-bound-err.rs:34:14
59+
--> $DIR/duplicate-bound-err.rs:33:14
6060
|
6161
LL | type Tait4 = impl Iterator<Item: Copy, Item: Send>;
6262
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6363
|
6464
= note: `Tait4` must be used in combination with a concrete type within the same crate
6565

6666
error: unconstrained opaque type
67-
--> $DIR/duplicate-bound-err.rs:36:14
67+
--> $DIR/duplicate-bound-err.rs:35:14
6868
|
6969
LL | type Tait5 = impl Iterator<Item: Copy, Item: Copy>;
7070
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7171
|
7272
= note: `Tait5` must be used in combination with a concrete type within the same crate
7373

7474
error: unconstrained opaque type
75-
--> $DIR/duplicate-bound-err.rs:38:14
75+
--> $DIR/duplicate-bound-err.rs:37:14
7676
|
7777
LL | type Tait6 = impl Iterator<Item: 'static, Item: 'static>;
7878
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7979
|
8080
= note: `Tait6` must be used in combination with a concrete type within the same crate
8181

8282
error[E0277]: `*const ()` cannot be sent between threads safely
83-
--> $DIR/duplicate-bound-err.rs:41:18
83+
--> $DIR/duplicate-bound-err.rs:40:18
8484
|
8585
LL | fn mismatch() -> impl Iterator<Item: Copy, Item: Send> {
8686
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
@@ -91,7 +91,7 @@ LL | iter::empty::<*const ()>()
9191
= help: the trait `Send` is not implemented for `*const ()`
9292

9393
error[E0277]: the trait bound `String: Copy` is not satisfied
94-
--> $DIR/duplicate-bound-err.rs:46:20
94+
--> $DIR/duplicate-bound-err.rs:45:20
9595
|
9696
LL | fn mismatch_2() -> impl Iterator<Item: Copy, Item: Send> {
9797
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `String`
@@ -100,7 +100,7 @@ LL | iter::empty::<String>()
100100
| ----------------------- return type was inferred to be `std::iter::Empty<String>` here
101101

102102
error[E0271]: expected `IntoIter<u32, 1>` to be an iterator that yields `i32`, but it yields `u32`
103-
--> $DIR/duplicate-bound-err.rs:112:17
103+
--> $DIR/duplicate-bound-err.rs:111:17
104104
|
105105
LL | fn foo() -> impl Iterator<Item = i32, Item = u32> {
106106
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
@@ -109,15 +109,15 @@ LL | [2u32].into_iter()
109109
| ------------------ return type was inferred to be `std::array::IntoIter<u32, 1>` here
110110

111111
error[E0719]: the value of the associated type `Item` in trait `Iterator` is already specified
112-
--> $DIR/duplicate-bound-err.rs:88:42
112+
--> $DIR/duplicate-bound-err.rs:87:42
113113
|
114114
LL | type MustFail = dyn Iterator<Item = i32, Item = u32>;
115115
| ---------- ^^^^^^^^^^ re-bound here
116116
| |
117117
| `Item` bound here first
118118

119119
error: conflicting associated type bounds for `Item`
120-
--> $DIR/duplicate-bound-err.rs:88:17
120+
--> $DIR/duplicate-bound-err.rs:87:17
121121
|
122122
LL | type MustFail = dyn Iterator<Item = i32, Item = u32>;
123123
| ^^^^^^^^^^^^^----------^^----------^
@@ -126,15 +126,15 @@ LL | type MustFail = dyn Iterator<Item = i32, Item = u32>;
126126
| `Item` is specified to be `i32` here
127127

128128
error[E0719]: the value of the associated type `ASSOC` in trait `Trait2` is already specified
129-
--> $DIR/duplicate-bound-err.rs:97:43
129+
--> $DIR/duplicate-bound-err.rs:96:43
130130
|
131131
LL | type MustFail2 = dyn Trait2<ASSOC = 3u32, ASSOC = 4u32>;
132132
| ------------ ^^^^^^^^^^^^ re-bound here
133133
| |
134134
| `ASSOC` bound here first
135135

136136
error: conflicting associated type bounds for `ASSOC`
137-
--> $DIR/duplicate-bound-err.rs:97:18
137+
--> $DIR/duplicate-bound-err.rs:96:18
138138
|
139139
LL | type MustFail2 = dyn Trait2<ASSOC = 3u32, ASSOC = 4u32>;
140140
| ^^^^^^^^^^^------------^^------------^
@@ -143,63 +143,63 @@ LL | type MustFail2 = dyn Trait2<ASSOC = 3u32, ASSOC = 4u32>;
143143
| `ASSOC` is specified to be `3` here
144144

145145
error[E0719]: the value of the associated type `Item` in trait `Iterator` is already specified
146-
--> $DIR/duplicate-bound-err.rs:101:43
146+
--> $DIR/duplicate-bound-err.rs:100:43
147147
|
148148
LL | type MustFail3 = dyn Iterator<Item = i32, Item = i32>;
149149
| ---------- ^^^^^^^^^^ re-bound here
150150
| |
151151
| `Item` bound here first
152152

153153
error[E0719]: the value of the associated type `ASSOC` in trait `Trait2` is already specified
154-
--> $DIR/duplicate-bound-err.rs:104:43
154+
--> $DIR/duplicate-bound-err.rs:103:43
155155
|
156156
LL | type MustFail4 = dyn Trait2<ASSOC = 3u32, ASSOC = 3u32>;
157157
| ------------ ^^^^^^^^^^^^ re-bound here
158158
| |
159159
| `ASSOC` bound here first
160160

161161
error[E0271]: expected `impl Iterator<Item = u32>` to be an iterator that yields `i32`, but it yields `u32`
162-
--> $DIR/duplicate-bound-err.rs:112:17
162+
--> $DIR/duplicate-bound-err.rs:111:17
163163
|
164164
LL | fn foo() -> impl Iterator<Item = i32, Item = u32> {
165165
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
166166
|
167167
note: required by a bound in `Trait3::foo::{anon_assoc#0}`
168-
--> $DIR/duplicate-bound-err.rs:108:31
168+
--> $DIR/duplicate-bound-err.rs:107:31
169169
|
170170
LL | fn foo() -> impl Iterator<Item = i32, Item = u32>;
171171
| ^^^^^^^^^^ required by this bound in `Trait3::foo::{anon_assoc#0}`
172172

173173
error[E0271]: expected `Empty<u32>` to be an iterator that yields `i32`, but it yields `u32`
174-
--> $DIR/duplicate-bound-err.rs:120:16
174+
--> $DIR/duplicate-bound-err.rs:119:16
175175
|
176176
LL | uncallable(iter::empty::<u32>());
177177
| ---------- ^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
178178
| |
179179
| required by a bound introduced by this call
180180
|
181181
note: required by a bound in `uncallable`
182-
--> $DIR/duplicate-bound-err.rs:80:32
182+
--> $DIR/duplicate-bound-err.rs:79:32
183183
|
184184
LL | fn uncallable(_: impl Iterator<Item = i32, Item = u32>) {}
185185
| ^^^^^^^^^^ required by this bound in `uncallable`
186186

187187
error[E0271]: expected `Empty<i32>` to be an iterator that yields `u32`, but it yields `i32`
188-
--> $DIR/duplicate-bound-err.rs:121:16
188+
--> $DIR/duplicate-bound-err.rs:120:16
189189
|
190190
LL | uncallable(iter::empty::<i32>());
191191
| ---------- ^^^^^^^^^^^^^^^^^^^^ expected `u32`, found `i32`
192192
| |
193193
| required by a bound introduced by this call
194194
|
195195
note: required by a bound in `uncallable`
196-
--> $DIR/duplicate-bound-err.rs:80:44
196+
--> $DIR/duplicate-bound-err.rs:79:44
197197
|
198198
LL | fn uncallable(_: impl Iterator<Item = i32, Item = u32>) {}
199199
| ^^^^^^^^^^ required by this bound in `uncallable`
200200

201201
error[E0271]: type mismatch resolving `<() as Trait>::ASSOC == 4`
202-
--> $DIR/duplicate-bound-err.rs:122:22
202+
--> $DIR/duplicate-bound-err.rs:121:22
203203
|
204204
LL | uncallable_const(());
205205
| ---------------- ^^ expected `4`, found `3`
@@ -209,13 +209,13 @@ LL | uncallable_const(());
209209
= note: expected constant `4`
210210
found constant `3`
211211
note: required by a bound in `uncallable_const`
212-
--> $DIR/duplicate-bound-err.rs:82:46
212+
--> $DIR/duplicate-bound-err.rs:81:46
213213
|
214214
LL | fn uncallable_const(_: impl Trait<ASSOC = 3, ASSOC = 4>) {}
215215
| ^^^^^^^^^ required by this bound in `uncallable_const`
216216

217217
error[E0271]: type mismatch resolving `<u32 as Trait>::ASSOC == 3`
218-
--> $DIR/duplicate-bound-err.rs:123:22
218+
--> $DIR/duplicate-bound-err.rs:122:22
219219
|
220220
LL | uncallable_const(4u32);
221221
| ---------------- ^^^^ expected `3`, found `4`
@@ -225,13 +225,13 @@ LL | uncallable_const(4u32);
225225
= note: expected constant `3`
226226
found constant `4`
227227
note: required by a bound in `uncallable_const`
228-
--> $DIR/duplicate-bound-err.rs:82:35
228+
--> $DIR/duplicate-bound-err.rs:81:35
229229
|
230230
LL | fn uncallable_const(_: impl Trait<ASSOC = 3, ASSOC = 4>) {}
231231
| ^^^^^^^^^ required by this bound in `uncallable_const`
232232

233233
error[E0271]: type mismatch resolving `<() as Trait>::ASSOC == 4`
234-
--> $DIR/duplicate-bound-err.rs:124:20
234+
--> $DIR/duplicate-bound-err.rs:123:20
235235
|
236236
LL | uncallable_rtn(());
237237
| -------------- ^^ expected `4`, found `3`
@@ -241,15 +241,15 @@ LL | uncallable_rtn(());
241241
= note: expected constant `4`
242242
found constant `3`
243243
note: required by a bound in `uncallable_rtn`
244-
--> $DIR/duplicate-bound-err.rs:85:61
244+
--> $DIR/duplicate-bound-err.rs:84:61
245245
|
246246
LL | fn uncallable_rtn(
247247
| -------------- required by a bound in this function
248248
LL | _: impl Trait<foo(..): Trait<ASSOC = 3>, foo(..): Trait<ASSOC = 4>>
249249
| ^^^^^^^^^ required by this bound in `uncallable_rtn`
250250

251251
error[E0271]: type mismatch resolving `<u32 as Trait>::ASSOC == 3`
252-
--> $DIR/duplicate-bound-err.rs:125:20
252+
--> $DIR/duplicate-bound-err.rs:124:20
253253
|
254254
LL | uncallable_rtn(17u32);
255255
| -------------- ^^^^^ expected `3`, found `4`
@@ -259,7 +259,7 @@ LL | uncallable_rtn(17u32);
259259
= note: expected constant `3`
260260
found constant `4`
261261
note: required by a bound in `uncallable_rtn`
262-
--> $DIR/duplicate-bound-err.rs:85:34
262+
--> $DIR/duplicate-bound-err.rs:84:34
263263
|
264264
LL | fn uncallable_rtn(
265265
| -------------- required by a bound in this function

0 commit comments

Comments
 (0)