Skip to content

Commit e635704

Browse files
JohnTitorJohnTitor
authored
Rollup merge of #98268 - compiler-errors:disallowed-generics-better, r=lcnr
Improve `lifetime arguments are not allowed on` error message Actually mention what thing we're improperly trying to add lifetime generics to.
2 parents b6fb582 + 2762d62 commit e635704

15 files changed

+67
-67
lines changed

‎compiler/rustc_typeck/src/astconv/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2195,8 +2195,8 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
21952195
"{kind} arguments are not allowed on {this_type}",
21962196
);
21972197
err.span_label(last_span, format!("{kind} argument{s} not allowed"));
2198-
for (_, span) in types_and_spans {
2199-
err.span_label(span, "not allowed on this");
2198+
for (what, span) in types_and_spans {
2199+
err.span_label(span, format!("not allowed on {what}"));
22002200
}
22012201
extend(&mut err);
22022202
err.emit();

‎src/test/ui/derives/issue-97343.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on type parameter `Irrelevant`
44
LL | #[derive(Debug)]
55
| -----
66
| |
7-
| not allowed on this
7+
| not allowed on type parameter `Irrelevant`
88
| in this derive macro expansion
99
LL | pub struct Irrelevant<Irrelevant> {
1010
| ^^^^^^^^^^ type argument not allowed

‎src/test/ui/error-codes/E0109.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on this type
44
LL | type X = u32<i32>;
55
| --- ^^^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on this type
88
|
99
help: primitive type `u32` doesn't have generic parameters
1010
|

‎src/test/ui/error-codes/E0110.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: lifetime arguments are not allowed on this type
44
LL | type X = u32<'static>;
55
| --- ^^^^^^^ lifetime argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on this type
88
|
99
help: primitive type `u32` doesn't have generic parameters
1010
|

‎src/test/ui/issues/issue-22706.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on module `marker`
44
LL | fn is_copy<T: ::std::marker<i32>::Copy>() {}
55
| ------ ^^^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on module `marker`
88

99
error: aborting due to previous error
1010

‎src/test/ui/issues/issue-57924.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on self constructor
44
LL | Self::<E>(e)
55
| ---- ^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on self constructor
88

99
error: aborting due to previous error
1010

‎src/test/ui/issues/issue-60989.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ error[E0109]: type arguments are not allowed on local variable
44
LL | c1::<()>;
55
| -- ^^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on local variable
88

99
error[E0109]: type arguments are not allowed on local variable
1010
--> $DIR/issue-60989.rs:16:10
1111
|
1212
LL | c1::<dyn Into<B>>;
1313
| -- ^^^^^^^^^^^ type argument not allowed
1414
| |
15-
| not allowed on this
15+
| not allowed on local variable
1616

1717
error: aborting due to 2 previous errors
1818

‎src/test/ui/mod-subitem-as-enum-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on module `Mod`
44
LL | Mod::<i32>::FakeVariant(0);
55
| --- ^^^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on module `Mod`
88

99
error: aborting due to previous error
1010

‎src/test/ui/structs/struct-path-associated-type.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0109]: type arguments are not allowed on this type
1010
LL | let z = T::A::<u8> {};
1111
| - ^^ type argument not allowed
1212
| |
13-
| not allowed on this
13+
| not allowed on this type
1414

1515
error[E0071]: expected struct, variant or union type, found associated type
1616
--> $DIR/struct-path-associated-type.rs:14:13
@@ -30,7 +30,7 @@ error[E0109]: type arguments are not allowed on this type
3030
LL | let z = T::A::<u8> {};
3131
| - ^^ type argument not allowed
3232
| |
33-
| not allowed on this
33+
| not allowed on this type
3434

3535
error[E0223]: ambiguous associated type
3636
--> $DIR/struct-path-associated-type.rs:32:13

‎src/test/ui/structs/struct-path-self.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0109]: type arguments are not allowed on self type
1010
LL | let z = Self::<u8> {};
1111
| ---- ^^ type argument not allowed
1212
| |
13-
| not allowed on this
13+
| not allowed on self type
1414
|
1515
help: the `Self` type doesn't accept type parameters
1616
|
@@ -36,7 +36,7 @@ error[E0109]: type arguments are not allowed on self type
3636
LL | let z = Self::<u8> {};
3737
| ---- ^^ type argument not allowed
3838
| |
39-
| not allowed on this
39+
| not allowed on self type
4040
|
4141
note: `Self` is of type `S`
4242
--> $DIR/struct-path-self.rs:1:8
@@ -58,7 +58,7 @@ error[E0109]: type arguments are not allowed on self type
5858
LL | let z = Self::<u8> {};
5959
| ---- ^^ type argument not allowed
6060
| |
61-
| not allowed on this
61+
| not allowed on self type
6262
|
6363
note: `Self` is of type `S`
6464
--> $DIR/struct-path-self.rs:1:8

‎src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr

+27-27
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ error[E0109]: type arguments are not allowed on this type
2323
LL | Self::TSVariant::<()>(());
2424
| --------- ^^ type argument not allowed
2525
| |
26-
| not allowed on this
26+
| not allowed on this type
2727

2828
error[E0109]: type arguments are not allowed on self type
2929
--> $DIR/enum-variant-generic-args.rs:17:16
3030
|
3131
LL | Self::<()>::TSVariant(());
3232
| ---- ^^ type argument not allowed
3333
| |
34-
| not allowed on this
34+
| not allowed on self type
3535
|
3636
note: `Self` is of type `Enum<T>`
3737
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -71,7 +71,7 @@ error[E0109]: type arguments are not allowed on self type
7171
LL | Self::<()>::TSVariant::<()>(());
7272
| ---- ^^ type argument not allowed
7373
| |
74-
| not allowed on this
74+
| not allowed on self type
7575
|
7676
note: `Self` is of type `Enum<T>`
7777
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -92,7 +92,7 @@ error[E0109]: type arguments are not allowed on this type
9292
LL | Self::<()>::TSVariant::<()>(());
9393
| --------- ^^ type argument not allowed
9494
| |
95-
| not allowed on this
95+
| not allowed on this type
9696

9797
error[E0308]: mismatched types
9898
--> $DIR/enum-variant-generic-args.rs:26:29
@@ -112,7 +112,7 @@ error[E0109]: type arguments are not allowed on this type
112112
LL | Self::SVariant::<()> { v: () };
113113
| -------- ^^ type argument not allowed
114114
| |
115-
| not allowed on this
115+
| not allowed on this type
116116
|
117117
= note: enum variants can't have type parameters
118118
help: you might have meant to specity type parameters on enum `Enum`
@@ -139,7 +139,7 @@ error[E0109]: type arguments are not allowed on self type
139139
LL | Self::<()>::SVariant { v: () };
140140
| ---- ^^ type argument not allowed
141141
| |
142-
| not allowed on this
142+
| not allowed on self type
143143
|
144144
note: `Self` is of type `Enum<T>`
145145
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -172,7 +172,7 @@ error[E0109]: type arguments are not allowed on self type
172172
LL | Self::<()>::SVariant::<()> { v: () };
173173
| ---- ^^ type argument not allowed
174174
| |
175-
| not allowed on this
175+
| not allowed on self type
176176
|
177177
note: `Self` is of type `Enum<T>`
178178
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -193,7 +193,7 @@ error[E0109]: type arguments are not allowed on this type
193193
LL | Self::<()>::SVariant::<()> { v: () };
194194
| -------- ^^ type argument not allowed
195195
| |
196-
| not allowed on this
196+
| not allowed on this type
197197
|
198198
= note: enum variants can't have type parameters
199199
help: you might have meant to specity type parameters on enum `Enum`
@@ -220,15 +220,15 @@ error[E0109]: type arguments are not allowed on this type
220220
LL | Self::UVariant::<()>;
221221
| -------- ^^ type argument not allowed
222222
| |
223-
| not allowed on this
223+
| not allowed on this type
224224

225225
error[E0109]: type arguments are not allowed on self type
226226
--> $DIR/enum-variant-generic-args.rs:43:16
227227
|
228228
LL | Self::<()>::UVariant;
229229
| ---- ^^ type argument not allowed
230230
| |
231-
| not allowed on this
231+
| not allowed on self type
232232
|
233233
note: `Self` is of type `Enum<T>`
234234
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -249,7 +249,7 @@ error[E0109]: type arguments are not allowed on self type
249249
LL | Self::<()>::UVariant::<()>;
250250
| ---- ^^ type argument not allowed
251251
| |
252-
| not allowed on this
252+
| not allowed on self type
253253
|
254254
note: `Self` is of type `Enum<T>`
255255
--> $DIR/enum-variant-generic-args.rs:7:6
@@ -270,39 +270,39 @@ error[E0109]: type arguments are not allowed on this type
270270
LL | Self::<()>::UVariant::<()>;
271271
| -------- ^^ type argument not allowed
272272
| |
273-
| not allowed on this
273+
| not allowed on this type
274274

275275
error[E0109]: type arguments are not allowed on this type
276276
--> $DIR/enum-variant-generic-args.rs:54:29
277277
|
278278
LL | Enum::<()>::TSVariant::<()>(());
279279
| --------- ^^ type argument not allowed
280280
| |
281-
| not allowed on this
281+
| not allowed on this type
282282

283283
error[E0109]: type arguments are not allowed on this type
284284
--> $DIR/enum-variant-generic-args.rs:57:24
285285
|
286286
LL | Alias::TSVariant::<()>(());
287287
| --------- ^^ type argument not allowed
288288
| |
289-
| not allowed on this
289+
| not allowed on this type
290290

291291
error[E0109]: type arguments are not allowed on this type
292292
--> $DIR/enum-variant-generic-args.rs:59:30
293293
|
294294
LL | Alias::<()>::TSVariant::<()>(());
295295
| --------- ^^ type argument not allowed
296296
| |
297-
| not allowed on this
297+
| not allowed on this type
298298

299299
error[E0109]: type arguments are not allowed on this type
300300
--> $DIR/enum-variant-generic-args.rs:62:29
301301
|
302302
LL | AliasFixed::TSVariant::<()>(());
303303
| --------- ^^ type argument not allowed
304304
| |
305-
| not allowed on this
305+
| not allowed on this type
306306

307307
error[E0107]: this type alias takes 0 generic arguments but 1 generic argument was supplied
308308
--> $DIR/enum-variant-generic-args.rs:64:5
@@ -338,15 +338,15 @@ error[E0109]: type arguments are not allowed on this type
338338
LL | AliasFixed::<()>::TSVariant::<()>(());
339339
| --------- ^^ type argument not allowed
340340
| |
341-
| not allowed on this
341+
| not allowed on this type
342342

343343
error[E0109]: type arguments are not allowed on this type
344344
--> $DIR/enum-variant-generic-args.rs:72:28
345345
|
346346
LL | Enum::<()>::SVariant::<()> { v: () };
347347
| -------- ^^ type argument not allowed
348348
| |
349-
| not allowed on this
349+
| not allowed on this type
350350
|
351351
= note: enum variants can't have type parameters
352352

@@ -356,7 +356,7 @@ error[E0109]: type arguments are not allowed on this type
356356
LL | Alias::SVariant::<()> { v: () };
357357
| -------- ^^ type argument not allowed
358358
| |
359-
| not allowed on this
359+
| not allowed on this type
360360
|
361361
= note: enum variants can't have type parameters
362362
help: you might have meant to specity type parameters on enum `Enum`
@@ -371,7 +371,7 @@ error[E0109]: type arguments are not allowed on this type
371371
LL | Alias::<()>::SVariant::<()> { v: () };
372372
| -------- ^^ type argument not allowed
373373
| |
374-
| not allowed on this
374+
| not allowed on this type
375375
|
376376
= note: enum variants can't have type parameters
377377
help: you might have meant to specity type parameters on enum `Enum`
@@ -386,7 +386,7 @@ error[E0109]: type arguments are not allowed on this type
386386
LL | AliasFixed::SVariant::<()> { v: () };
387387
| -------- ^^ type argument not allowed
388388
| |
389-
| not allowed on this
389+
| not allowed on this type
390390
|
391391
= note: enum variants can't have type parameters
392392
help: you might have meant to specity type parameters on enum `Enum`
@@ -429,7 +429,7 @@ error[E0109]: type arguments are not allowed on this type
429429
LL | AliasFixed::<()>::SVariant::<()> { v: () };
430430
| -------- ^^ type argument not allowed
431431
| |
432-
| not allowed on this
432+
| not allowed on this type
433433
|
434434
= note: enum variants can't have type parameters
435435
help: you might have meant to specity type parameters on enum `Enum`
@@ -444,31 +444,31 @@ error[E0109]: type arguments are not allowed on this type
444444
LL | Enum::<()>::UVariant::<()>;
445445
| -------- ^^ type argument not allowed
446446
| |
447-
| not allowed on this
447+
| not allowed on this type
448448

449449
error[E0109]: type arguments are not allowed on this type
450450
--> $DIR/enum-variant-generic-args.rs:93:23
451451
|
452452
LL | Alias::UVariant::<()>;
453453
| -------- ^^ type argument not allowed
454454
| |
455-
| not allowed on this
455+
| not allowed on this type
456456

457457
error[E0109]: type arguments are not allowed on this type
458458
--> $DIR/enum-variant-generic-args.rs:95:29
459459
|
460460
LL | Alias::<()>::UVariant::<()>;
461461
| -------- ^^ type argument not allowed
462462
| |
463-
| not allowed on this
463+
| not allowed on this type
464464

465465
error[E0109]: type arguments are not allowed on this type
466466
--> $DIR/enum-variant-generic-args.rs:98:28
467467
|
468468
LL | AliasFixed::UVariant::<()>;
469469
| -------- ^^ type argument not allowed
470470
| |
471-
| not allowed on this
471+
| not allowed on this type
472472

473473
error[E0107]: this type alias takes 0 generic arguments but 1 generic argument was supplied
474474
--> $DIR/enum-variant-generic-args.rs:100:5
@@ -504,7 +504,7 @@ error[E0109]: type arguments are not allowed on this type
504504
LL | AliasFixed::<()>::UVariant::<()>;
505505
| -------- ^^ type argument not allowed
506506
| |
507-
| not allowed on this
507+
| not allowed on this type
508508

509509
error: aborting due to 39 previous errors
510510

‎src/test/ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0109]: type arguments are not allowed on this type
44
LL | let _ = Alias::None::<u8>;
55
| ---- ^^ type argument not allowed
66
| |
7-
| not allowed on this
7+
| not allowed on this type
88

99
error: aborting due to previous error
1010

‎src/test/ui/type/issue-91268.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ error[E0109]: type arguments are not allowed on this type
4141
LL | 0: u8(ţ
4242
| -- ^ type argument not allowed
4343
| |
44-
| not allowed on this
44+
| not allowed on this type
4545
|
4646
help: primitive type `u8` doesn't have generic parameters
4747
|

0 commit comments

Comments
 (0)