Skip to content

Commit 0748638

Browse files
JohnTitorJohnTitor
authored
Rollup merge of #99036 - TaKO8Ki:fix-test-for-88138, r=compiler-errors
Add `#[test]` to functions in test modules I implemented a suggestion in #91770, but the ui test I created was inadequate and I have fixed that.
2 parents 48cf43b + 29dc72d commit 0748638

4 files changed

+97
-186
lines changed

Diff for: ‎src/test/ui/imports/unused-imports-in-test-mode.rs

+36-18
Original file line numberDiff line numberDiff line change
@@ -8,76 +8,94 @@ fn a() {}
88
fn b() {}
99

1010
mod test {
11-
use super::a; //~ ERROR unused import: `super::a`
11+
use super::a;
1212

13+
#[test]
1314
fn foo() {
14-
use crate::b; //~ ERROR unused import: `crate::b`
15+
a();
16+
use crate::b; //~ ERROR unused import: `crate::b`
1517
}
1618
}
1719

1820
mod tests {
19-
use super::a; //~ ERROR unused import: `super::a`
21+
use super::a;
2022

23+
#[test]
2124
fn foo() {
22-
use crate::b; //~ ERROR unused import: `crate::b`
25+
a();
26+
use crate::b; //~ ERROR unused import: `crate::b`
2327
}
2428
}
2529

2630
mod test_a {
27-
use super::a; //~ ERROR unused import: `super::a`
31+
use super::a;
2832

33+
#[test]
2934
fn foo() {
30-
use crate::b; //~ ERROR unused import: `crate::b`
35+
a();
36+
use crate::b; //~ ERROR unused import: `crate::b`
3137
}
3238
}
3339

3440
mod a_test {
35-
use super::a; //~ ERROR unused import: `super::a`
41+
use super::a;
3642

43+
#[test]
3744
fn foo() {
38-
use crate::b; //~ ERROR unused import: `crate::b`
45+
a();
46+
use crate::b; //~ ERROR unused import: `crate::b`
3947
}
4048
}
4149

4250
mod tests_a {
43-
use super::a; //~ ERROR unused import: `super::a`
51+
use super::a;
4452

53+
#[test]
4554
fn foo() {
46-
use crate::b; //~ ERROR unused import: `crate::b`
55+
a();
56+
use crate::b; //~ ERROR unused import: `crate::b`
4757
}
4858
}
4959

5060
mod a_tests {
51-
use super::a; //~ ERROR unused import: `super::a`
61+
use super::a;
5262

63+
#[test]
5364
fn foo() {
54-
use crate::b; //~ ERROR unused import: `crate::b`
65+
a();
66+
use crate::b; //~ ERROR unused import: `crate::b`
5567
}
5668
}
5769

5870
mod fastest_search {
59-
use super::a; //~ ERROR unused import: `super::a`
71+
use super::a;
6072

73+
#[test]
6174
fn foo() {
62-
use crate::b; //~ ERROR unused import: `crate::b`
75+
a();
76+
use crate::b; //~ ERROR unused import: `crate::b`
6377
}
6478
}
6579

6680
#[cfg(test)]
6781
mod test_has_attr {
68-
use super::a; //~ ERROR unused import: `super::a`
82+
use super::a;
6983

84+
#[test]
7085
fn foo() {
71-
use crate::b; //~ ERROR unused import: `crate::b`
86+
a();
87+
use crate::b; //~ ERROR unused import: `crate::b`
7288
}
7389
}
7490

7591
mod test_has_no_attr {
7692
#[cfg(test)]
77-
use super::a; //~ ERROR unused import: `super::a`
93+
use super::a;
7894

95+
#[test]
7996
fn foo() {
80-
use crate::b; //~ ERROR unused import: `crate::b`
97+
a();
98+
use crate::b; //~ ERROR unused import: `crate::b`
8199
}
82100
}
83101

Diff for: ‎src/test/ui/imports/unused-imports-in-test-mode.stderr

+10-64
Original file line numberDiff line numberDiff line change
@@ -10,113 +10,59 @@ note: the lint level is defined here
1010
LL | #![deny(unused_imports)]
1111
| ^^^^^^^^^^^^^^
1212

13-
error: unused import: `super::a`
14-
--> $DIR/unused-imports-in-test-mode.rs:11:9
15-
|
16-
LL | use super::a;
17-
| ^^^^^^^^
18-
1913
error: unused import: `crate::b`
20-
--> $DIR/unused-imports-in-test-mode.rs:14:13
14+
--> $DIR/unused-imports-in-test-mode.rs:16:13
2115
|
2216
LL | use crate::b;
2317
| ^^^^^^^^
2418

25-
error: unused import: `super::a`
26-
--> $DIR/unused-imports-in-test-mode.rs:19:9
27-
|
28-
LL | use super::a;
29-
| ^^^^^^^^
30-
3119
error: unused import: `crate::b`
32-
--> $DIR/unused-imports-in-test-mode.rs:22:13
20+
--> $DIR/unused-imports-in-test-mode.rs:26:13
3321
|
3422
LL | use crate::b;
3523
| ^^^^^^^^
3624

37-
error: unused import: `super::a`
38-
--> $DIR/unused-imports-in-test-mode.rs:27:9
39-
|
40-
LL | use super::a;
41-
| ^^^^^^^^
42-
4325
error: unused import: `crate::b`
44-
--> $DIR/unused-imports-in-test-mode.rs:30:13
26+
--> $DIR/unused-imports-in-test-mode.rs:36:13
4527
|
4628
LL | use crate::b;
4729
| ^^^^^^^^
4830

49-
error: unused import: `super::a`
50-
--> $DIR/unused-imports-in-test-mode.rs:35:9
51-
|
52-
LL | use super::a;
53-
| ^^^^^^^^
54-
5531
error: unused import: `crate::b`
56-
--> $DIR/unused-imports-in-test-mode.rs:38:13
32+
--> $DIR/unused-imports-in-test-mode.rs:46:13
5733
|
5834
LL | use crate::b;
5935
| ^^^^^^^^
6036

61-
error: unused import: `super::a`
62-
--> $DIR/unused-imports-in-test-mode.rs:43:9
63-
|
64-
LL | use super::a;
65-
| ^^^^^^^^
66-
6737
error: unused import: `crate::b`
68-
--> $DIR/unused-imports-in-test-mode.rs:46:13
38+
--> $DIR/unused-imports-in-test-mode.rs:56:13
6939
|
7040
LL | use crate::b;
7141
| ^^^^^^^^
7242

73-
error: unused import: `super::a`
74-
--> $DIR/unused-imports-in-test-mode.rs:51:9
75-
|
76-
LL | use super::a;
77-
| ^^^^^^^^
78-
7943
error: unused import: `crate::b`
80-
--> $DIR/unused-imports-in-test-mode.rs:54:13
44+
--> $DIR/unused-imports-in-test-mode.rs:66:13
8145
|
8246
LL | use crate::b;
8347
| ^^^^^^^^
8448

85-
error: unused import: `super::a`
86-
--> $DIR/unused-imports-in-test-mode.rs:59:9
87-
|
88-
LL | use super::a;
89-
| ^^^^^^^^
90-
9149
error: unused import: `crate::b`
92-
--> $DIR/unused-imports-in-test-mode.rs:62:13
50+
--> $DIR/unused-imports-in-test-mode.rs:76:13
9351
|
9452
LL | use crate::b;
9553
| ^^^^^^^^
9654

97-
error: unused import: `super::a`
98-
--> $DIR/unused-imports-in-test-mode.rs:68:9
99-
|
100-
LL | use super::a;
101-
| ^^^^^^^^
102-
10355
error: unused import: `crate::b`
104-
--> $DIR/unused-imports-in-test-mode.rs:71:13
56+
--> $DIR/unused-imports-in-test-mode.rs:87:13
10557
|
10658
LL | use crate::b;
10759
| ^^^^^^^^
10860

109-
error: unused import: `super::a`
110-
--> $DIR/unused-imports-in-test-mode.rs:77:9
111-
|
112-
LL | use super::a;
113-
| ^^^^^^^^
114-
11561
error: unused import: `crate::b`
116-
--> $DIR/unused-imports-in-test-mode.rs:80:13
62+
--> $DIR/unused-imports-in-test-mode.rs:98:13
11763
|
11864
LL | use crate::b;
11965
| ^^^^^^^^
12066

121-
error: aborting due to 19 previous errors
67+
error: aborting due to 10 previous errors
12268

Diff for: ‎src/test/ui/imports/unused-imports-in-test-module.rs

+39-14
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,83 @@ fn a() {}
66
fn b() {}
77

88
mod test {
9-
use super::a; //~ ERROR unused import: `super::a`
9+
use super::a; //~ ERROR unused import: `super::a`
1010

11+
#[test]
1112
fn foo() {
12-
use crate::b; //~ ERROR unused import: `crate::b`
13+
a();
14+
use crate::b;
1315
}
1416
}
1517

1618
mod tests {
17-
use super::a; //~ ERROR unused import: `super::a`
19+
use super::a; //~ ERROR unused import: `super::a`
1820

21+
#[test]
1922
fn foo() {
20-
use crate::b; //~ ERROR unused import: `crate::b`
23+
a();
24+
use crate::b;
2125
}
2226
}
2327

2428
mod test_a {
25-
use super::a; //~ ERROR unused import: `super::a`
29+
use super::a; //~ ERROR unused import: `super::a`
2630

31+
#[test]
2732
fn foo() {
28-
use crate::b; //~ ERROR unused import: `crate::b`
33+
a();
34+
use crate::b;
2935
}
3036
}
3137

3238
mod a_test {
33-
use super::a; //~ ERROR unused import: `super::a`
39+
use super::a; //~ ERROR unused import: `super::a`
3440

41+
#[test]
3542
fn foo() {
36-
use crate::b; //~ ERROR unused import: `crate::b`
43+
a();
44+
use crate::b;
3745
}
3846
}
3947

4048
mod tests_a {
41-
use super::a; //~ ERROR unused import: `super::a`
49+
use super::a; //~ ERROR unused import: `super::a`
4250

51+
#[test]
4352
fn foo() {
44-
use crate::b; //~ ERROR unused import: `crate::b`
53+
a();
54+
use crate::b;
4555
}
4656
}
4757

4858
mod a_tests {
49-
use super::a; //~ ERROR unused import: `super::a`
59+
use super::a; //~ ERROR unused import: `super::a`
5060

61+
#[test]
5162
fn foo() {
52-
use crate::b; //~ ERROR unused import: `crate::b`
63+
a();
64+
use crate::b;
5365
}
5466
}
5567

5668
mod fastest_search {
57-
use super::a; //~ ERROR unused import: `super::a`
69+
use super::a; //~ ERROR unused import: `super::a`
5870

71+
#[test]
5972
fn foo() {
60-
use crate::b; //~ ERROR unused import: `crate::b`
73+
a();
74+
use crate::b;
75+
}
76+
}
77+
78+
#[cfg(test)]
79+
mod test_has_attr {
80+
use super::a;
81+
82+
#[test]
83+
fn foo() {
84+
a();
85+
use crate::b;
6186
}
6287
}
6388

0 commit comments

Comments
 (0)