Skip to content

Commit 6efacdd

Browse files
NoratriebNoratrieb
committed
Bless tests
1 parent 32203e8 commit 6efacdd

File tree

10 files changed

+111
-45
lines changed

10 files changed

+111
-45
lines changed

‎src/test/codegen-units/polymorphization/unused_type_parameters.rs

+14-20
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ mod functions {
4141
//~ MONO_ITEM fn functions::used_argument::<u64>
4242
//
4343
// Function uses type parameter in substitutions to another function.
44-
pub fn used_substs<T>() {
44+
pub fn forwarded<T>() {
4545
unused::<T>()
4646
}
4747

48-
//~ MONO_ITEM fn functions::used_substs::<u32>
49-
//~ MONO_ITEM fn functions::used_substs::<u64>
48+
//~ MONO_ITEM fn functions::forwarded::<T>
5049
}
5150

5251

@@ -144,15 +143,13 @@ mod closures {
144143
//~ MONO_ITEM fn closures::used_upvar::<u64>
145144

146145
// Closure uses type parameter in substitutions to another function.
147-
pub fn used_substs<T>() {
146+
pub fn forwarded<T>() {
148147
let x = || super::functions::unused::<T>();
149148
x()
150149
}
151150

152-
//~ MONO_ITEM fn closures::used_substs::<u32>::{closure#0}
153-
//~ MONO_ITEM fn closures::used_substs::<u64>::{closure#0}
154-
//~ MONO_ITEM fn closures::used_substs::<u32>
155-
//~ MONO_ITEM fn closures::used_substs::<u64>
151+
//~ MONO_ITEM fn closures::forwarded::<T>::{closure#0}
152+
//~ MONO_ITEM fn closures::forwarded::<T>
156153
}
157154

158155
mod methods {
@@ -197,12 +194,11 @@ mod methods {
197194
//~ MONO_ITEM fn methods::Foo::<u64>::used_both::<u64>
198195

199196
// Function uses type parameter in substitutions to another function.
200-
pub fn used_substs() {
197+
pub fn forwarded() {
201198
super::functions::unused::<F>()
202199
}
203200

204-
//~ MONO_ITEM fn methods::Foo::<u32>::used_substs
205-
//~ MONO_ITEM fn methods::Foo::<u64>::used_substs
201+
//~ MONO_ITEM fn methods::Foo::<F>::forwarded
206202

207203
// Function has an unused type parameter from impl and fn.
208204
pub fn closure_unused_all<G: Default>() -> u32 {
@@ -260,15 +256,13 @@ mod methods {
260256
//~ MONO_ITEM fn methods::Foo::<u64>::closure_used_impl::<G>
261257

262258
// Closure uses type parameter in substitutions to another function.
263-
pub fn closure_used_substs() {
259+
pub fn closure_forwarded() {
264260
let x = || super::functions::unused::<F>();
265261
x()
266262
}
267263

268-
//~ MONO_ITEM fn methods::Foo::<u32>::closure_used_substs::{closure#0}
269-
//~ MONO_ITEM fn methods::Foo::<u64>::closure_used_substs::{closure#0}
270-
//~ MONO_ITEM fn methods::Foo::<u32>::closure_used_substs
271-
//~ MONO_ITEM fn methods::Foo::<u64>::closure_used_substs
264+
//~ MONO_ITEM fn methods::Foo::<F>::closure_forwarded::{closure#0}
265+
//~ MONO_ITEM fn methods::Foo::<F>::closure_forwarded
272266
}
273267
}
274268

@@ -280,7 +274,7 @@ fn dispatch<T: Default>() {
280274
functions::used_binding_value::<T>();
281275
functions::used_binding_type::<T>();
282276
functions::used_argument::<T>(Default::default());
283-
functions::used_substs::<T>();
277+
functions::forwarded::<T>();
284278

285279
closures::no_parameters();
286280
let _ = closures::unused::<T>();
@@ -290,19 +284,19 @@ fn dispatch<T: Default>() {
290284
let _ = closures::used_argument::<T>(Default::default());
291285
let _ = closures::used_argument_closure::<T>();
292286
let _ = closures::used_upvar::<T>();
293-
let _ = closures::used_substs::<T>();
287+
let _ = closures::forwarded::<T>();
294288

295289
methods::Foo::<T>::unused_impl();
296290
methods::Foo::<T>::unused_both::<T>();
297291
methods::Foo::<T>::used_impl();
298292
methods::Foo::<T>::used_fn::<T>();
299293
methods::Foo::<T>::used_both::<T>();
300-
methods::Foo::<T>::used_substs();
294+
methods::Foo::<T>::forwarded();
301295
let _ = methods::Foo::<T>::closure_unused_all::<T>();
302296
let _ = methods::Foo::<T>::closure_used_both::<T>();
303297
let _ = methods::Foo::<T>::closure_used_impl::<T>();
304298
let _ = methods::Foo::<T>::closure_used_fn::<T>();
305-
let _ = methods::Foo::<T>::closure_used_substs();
299+
let _ = methods::Foo::<T>::closure_forwarded();
306300
}
307301

308302
//~ MONO_ITEM fn dispatch::<u32>

‎src/test/ui/polymorphization/const_parameters/closures.rs

+2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ pub fn unused_upvar<const T: usize>() -> usize {
5353
// Closure uses generic parameter in substitutions to another function.
5454
#[rustc_polymorphize_error]
5555
pub fn used_substs<const T: usize>() -> usize {
56+
//~^ ERROR item has unused generic parameters
5657
let x = || unused::<T>();
58+
//~^ ERROR item has unused generic parameters
5759
x()
5860
}
5961

‎src/test/ui/polymorphization/const_parameters/closures.stderr

+16-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,20 @@ LL | let x: usize = T;
4040
LL | let y = || x;
4141
| ^^
4242

43-
error: aborting due to 4 previous errors; 1 warning emitted
43+
error: item has unused generic parameters
44+
--> $DIR/closures.rs:57:13
45+
|
46+
LL | pub fn used_substs<const T: usize>() -> usize {
47+
| -------------- generic parameter `T` is unused
48+
LL |
49+
LL | let x = || unused::<T>();
50+
| ^^
51+
52+
error: item has unused generic parameters
53+
--> $DIR/closures.rs:55:8
54+
|
55+
LL | pub fn used_substs<const T: usize>() -> usize {
56+
| ^^^^^^^^^^^ -------------- generic parameter `T` is unused
57+
58+
error: aborting due to 6 previous errors; 1 warning emitted
4459

‎src/test/ui/polymorphization/const_parameters/functions.rs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pub fn used_binding<const T: usize>() -> usize {
2626
// Function uses generic parameter in substitutions to another function.
2727
#[rustc_polymorphize_error]
2828
pub fn used_substs<const T: usize>() {
29+
//~^ ERROR item has unused generic parameters
2930
unused::<T>()
3031
}
3132

‎src/test/ui/polymorphization/const_parameters/functions.stderr

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,11 @@ error: item has unused generic parameters
1313
LL | pub fn unused<const T: usize>() {
1414
| ^^^^^^ -------------- generic parameter `T` is unused
1515

16-
error: aborting due to previous error; 1 warning emitted
16+
error: item has unused generic parameters
17+
--> $DIR/functions.rs:28:8
18+
|
19+
LL | pub fn used_substs<const T: usize>() {
20+
| ^^^^^^^^^^^ -------------- generic parameter `T` is unused
21+
22+
error: aborting due to 2 previous errors; 1 warning emitted
1723

‎src/test/ui/polymorphization/predicates.stderr

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
error: item has unused generic parameters
2+
--> $DIR/predicates.rs:10:4
3+
|
4+
LL | fn bar<I>() {
5+
| ^^^ - generic parameter `I` is unused
6+
17
error: item has unused generic parameters
28
--> $DIR/predicates.rs:15:4
39
|
@@ -35,17 +41,5 @@ error: item has unused generic parameters
3541
LL | fn foobar<F, G>() -> usize
3642
| ^^^^^^ - generic parameter `F` is unused
3743

38-
error: item has unused generic parameters
39-
--> $DIR/predicates.rs:10:4
40-
|
41-
LL | fn bar<I>() {
42-
| ^^^ - generic parameter `I` is unused
43-
44-
note: the above error was encountered while instantiating `fn foo::<std::slice::Iter<'_, u32>, T>`
45-
--> $DIR/predicates.rs:86:5
46-
|
47-
LL | foo(x.iter());
48-
| ^^^^^^^^^^^^^
49-
5044
error: aborting due to 6 previous errors
5145

‎src/test/ui/polymorphization/type_parameters/closures.rs

+4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ pub fn used_upvar<T: Default>() -> T {
8080
// Closure uses generic parameter in substitutions to another function.
8181
#[rustc_polymorphize_error]
8282
pub fn used_substs<T>() -> u32 {
83+
//~^ ERROR item has unused generic parameters
8384
let x = || unused::<T>();
85+
//~^ ERROR item has unused generic parameters
8486
x()
8587
}
8688

@@ -137,7 +139,9 @@ impl<F: Default> Foo<F> {
137139
// Closure uses generic parameter in substitutions to another function.
138140
#[rustc_polymorphize_error]
139141
pub fn used_substs() -> u32 {
142+
//~^ ERROR item has unused generic parameters
140143
let x = || unused::<F>();
144+
//~^ ERROR item has unused generic parameters
141145
x()
142146
}
143147
}

‎src/test/ui/polymorphization/type_parameters/closures.stderr

+40-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,22 @@ LL | let add_one = |x: u32| x + 1;
2323
| ^^^^^^^^
2424

2525
error: item has unused generic parameters
26-
--> $DIR/closures.rs:94:23
26+
--> $DIR/closures.rs:84:13
27+
|
28+
LL | pub fn used_substs<T>() -> u32 {
29+
| - generic parameter `T` is unused
30+
LL |
31+
LL | let x = || unused::<T>();
32+
| ^^
33+
34+
error: item has unused generic parameters
35+
--> $DIR/closures.rs:82:8
36+
|
37+
LL | pub fn used_substs<T>() -> u32 {
38+
| ^^^^^^^^^^^ - generic parameter `T` is unused
39+
40+
error: item has unused generic parameters
41+
--> $DIR/closures.rs:96:23
2742
|
2843
LL | impl<F: Default> Foo<F> {
2944
| - generic parameter `F` is unused
@@ -35,7 +50,7 @@ LL | let add_one = |x: u32| x + 1;
3550
| ^^^^^^^^
3651

3752
error: item has unused generic parameters
38-
--> $DIR/closures.rs:92:12
53+
--> $DIR/closures.rs:94:12
3954
|
4055
LL | impl<F: Default> Foo<F> {
4156
| - generic parameter `F` is unused
@@ -44,7 +59,7 @@ LL | pub fn unused_all<G: Default>() -> u32 {
4459
| ^^^^^^^^^^ - generic parameter `G` is unused
4560

4661
error: item has unused generic parameters
47-
--> $DIR/closures.rs:128:23
62+
--> $DIR/closures.rs:130:23
4863
|
4964
LL | pub fn used_impl<G: Default>() -> u32 {
5065
| - generic parameter `G` is unused
@@ -53,13 +68,13 @@ LL | let add_one = |x: u32| {
5368
| ^^^^^^^^
5469

5570
error: item has unused generic parameters
56-
--> $DIR/closures.rs:126:12
71+
--> $DIR/closures.rs:128:12
5772
|
5873
LL | pub fn used_impl<G: Default>() -> u32 {
5974
| ^^^^^^^^^ - generic parameter `G` is unused
6075

6176
error: item has unused generic parameters
62-
--> $DIR/closures.rs:115:23
77+
--> $DIR/closures.rs:117:23
6378
|
6479
LL | impl<F: Default> Foo<F> {
6580
| - generic parameter `F` is unused
@@ -68,13 +83,31 @@ LL | let add_one = |x: u32| {
6883
| ^^^^^^^^
6984

7085
error: item has unused generic parameters
71-
--> $DIR/closures.rs:113:12
86+
--> $DIR/closures.rs:115:12
7287
|
7388
LL | impl<F: Default> Foo<F> {
7489
| - generic parameter `F` is unused
7590
...
7691
LL | pub fn used_fn<G: Default>() -> u32 {
7792
| ^^^^^^^
7893

79-
error: aborting due to 9 previous errors
94+
error: item has unused generic parameters
95+
--> $DIR/closures.rs:143:17
96+
|
97+
LL | impl<F: Default> Foo<F> {
98+
| - generic parameter `F` is unused
99+
...
100+
LL | let x = || unused::<F>();
101+
| ^^
102+
103+
error: item has unused generic parameters
104+
--> $DIR/closures.rs:141:12
105+
|
106+
LL | impl<F: Default> Foo<F> {
107+
| - generic parameter `F` is unused
108+
...
109+
LL | pub fn used_substs() -> u32 {
110+
| ^^^^^^^^^^^
111+
112+
error: aborting due to 13 previous errors
80113

‎src/test/ui/polymorphization/type_parameters/functions.rs

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub fn used_argument<T>(_: T) {}
3434
// Function uses generic parameter in substitutions to another function.
3535
#[rustc_polymorphize_error]
3636
pub fn used_substs<T>() {
37+
//~^ ERROR item has unused generic parameters
3738
unused::<T>()
3839
}
3940

@@ -75,6 +76,7 @@ impl<F: Default> Foo<F> {
7576
// Function uses generic parameter in substitutions to another function.
7677
#[rustc_polymorphize_error]
7778
pub fn used_substs() {
79+
//~^ ERROR item has unused generic parameters
7880
unused::<F>()
7981
}
8082
}

‎src/test/ui/polymorphization/type_parameters/functions.stderr

+19-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ LL | pub fn unused<T>() {
55
| ^^^^^^ - generic parameter `T` is unused
66

77
error: item has unused generic parameters
8-
--> $DIR/functions.rs:45:12
8+
--> $DIR/functions.rs:36:8
9+
|
10+
LL | pub fn used_substs<T>() {
11+
| ^^^^^^^^^^^ - generic parameter `T` is unused
12+
13+
error: item has unused generic parameters
14+
--> $DIR/functions.rs:46:12
915
|
1016
LL | impl<F: Default> Foo<F> {
1117
| - generic parameter `F` is unused
@@ -14,7 +20,7 @@ LL | pub fn unused_impl() {
1420
| ^^^^^^^^^^^
1521

1622
error: item has unused generic parameters
17-
--> $DIR/functions.rs:51:12
23+
--> $DIR/functions.rs:52:12
1824
|
1925
LL | impl<F: Default> Foo<F> {
2026
| - generic parameter `F` is unused
@@ -23,13 +29,22 @@ LL | pub fn unused_both<G: Default>() {
2329
| ^^^^^^^^^^^ - generic parameter `G` is unused
2430

2531
error: item has unused generic parameters
26-
--> $DIR/functions.rs:63:12
32+
--> $DIR/functions.rs:64:12
2733
|
2834
LL | impl<F: Default> Foo<F> {
2935
| - generic parameter `F` is unused
3036
...
3137
LL | pub fn used_fn<G: Default>() {
3238
| ^^^^^^^
3339

34-
error: aborting due to 4 previous errors
40+
error: item has unused generic parameters
41+
--> $DIR/functions.rs:78:12
42+
|
43+
LL | impl<F: Default> Foo<F> {
44+
| - generic parameter `F` is unused
45+
...
46+
LL | pub fn used_substs() {
47+
| ^^^^^^^^^^^
48+
49+
error: aborting due to 6 previous errors
3550

0 commit comments

Comments
 (0)