Skip to content

Commit 59d9aa3

Browse files
committed
Check that test systems are actualy systems
1 parent 1be2fe1 commit 59d9aa3

File tree

2 files changed

+119
-75
lines changed

2 files changed

+119
-75
lines changed

crates/bevy_lint/ui/unnecessary_with.rs

Lines changed: 72 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,75 @@ struct A;
77
struct B;
88
struct C;
99

10-
fn test_query1(_query: Query<&A, With<A>>) {}
11-
fn test_query2(_query: Query<(&A, &B), With<A>>) {}
12-
fn test_query3(_query: Query<(&A, &B), With<B>>) {}
13-
fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {}
14-
fn test_query5(_query: Query<(&A, &B), (With<A>, With<C>)>) {}
15-
fn test_query6(_query: Query<&A, (With<A>, With<B>)>) {}
16-
17-
fn test_query7(_query: Query<&mut A, With<A>>) {}
18-
fn test_query8(_query: Query<(&mut A, &B), With<A>>) {}
19-
fn test_query9(_query: Query<(&mut A, &B), With<B>>) {}
20-
fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {}
21-
fn test_query11(_query: Query<(&mut A, &B), (With<A>, With<C>)>) {}
22-
fn test_query12(_query: Query<&mut A, (With<A>, With<B>)>) {}
23-
24-
fn test_query13(_query: Query<(), (Added<A>, With<A>)>) {}
25-
fn test_query14(_query: Query<(), (Changed<A>, With<A>)>) {}
26-
27-
fn test_query15(_query: Query<&A, Or<(With<A>, With<B>)>>) {}
28-
fn test_query16(_query: Query<&B, Or<(With<A>, With<B>)>>) {}
29-
30-
fn test_query17(_query: Query<&mut A, Or<(With<A>, With<B>)>>) {}
31-
fn test_query18(_query: Query<&mut B, Or<(With<A>, With<B>)>>) {}
32-
33-
fn test_query19(_query: Query<(), Or<(Added<A>, With<A>)>>) {}
34-
fn test_query20(_query: Query<(), Or<(Changed<A>, With<A>)>>) {}
35-
36-
fn test_query21(_query: Query<&A, (Or<(With<A>, With<B>)>, With<C>)>) {}
37-
fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {}
10+
fn test_query1(_query: Query<&A, With<A>>) {
11+
test_query1.system();
12+
}
13+
fn test_query2(_query: Query<(&A, &B), With<A>>) {
14+
test_query2.system();
15+
}
16+
fn test_query3(_query: Query<(&A, &B), With<B>>) {
17+
test_query3.system();
18+
}
19+
fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {
20+
test_query4.system();
21+
}
22+
fn test_query5(_query: Query<(&A, &B), (With<A>, With<C>)>) {
23+
test_query5.system();
24+
}
25+
fn test_query6(_query: Query<&A, (With<A>, With<B>)>) {
26+
test_query6.system();
27+
}
28+
29+
fn test_query7(_query: Query<&mut A, With<A>>) {
30+
test_query7.system();
31+
}
32+
fn test_query8(_query: Query<(&mut A, &B), With<A>>) {
33+
test_query8.system();
34+
}
35+
fn test_query9(_query: Query<(&mut A, &B), With<B>>) {
36+
test_query9.system();
37+
}
38+
fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {
39+
test_query10.system();
40+
}
41+
fn test_query11(_query: Query<(&mut A, &B), (With<A>, With<C>)>) {
42+
test_query11.system();
43+
}
44+
fn test_query12(_query: Query<&mut A, (With<A>, With<B>)>) {
45+
test_query12.system();
46+
}
47+
48+
fn test_query13(_query: Query<(), (Added<A>, With<A>)>) {
49+
test_query13.system();
50+
}
51+
fn test_query14(_query: Query<(), (Changed<A>, With<A>)>) {
52+
test_query14.system();
53+
}
54+
55+
fn test_query15(_query: Query<&A, Or<(With<A>, With<B>)>>) {
56+
test_query15.system();
57+
}
58+
fn test_query16(_query: Query<&B, Or<(With<A>, With<B>)>>) {
59+
test_query16.system();
60+
}
61+
62+
fn test_query17(_query: Query<&mut A, Or<(With<A>, With<B>)>>) {
63+
test_query17.system();
64+
}
65+
fn test_query18(_query: Query<&mut B, Or<(With<A>, With<B>)>>) {
66+
test_query18.system();
67+
}
68+
69+
fn test_query19(_query: Query<(), Or<(Added<A>, With<A>)>>) {
70+
test_query19.system();
71+
}
72+
fn test_query20(_query: Query<(), Or<(Changed<A>, With<A>)>>) {
73+
test_query20.system();
74+
}
75+
76+
fn test_query21(_query: Query<&A, (Or<(With<A>, With<B>)>, With<C>)>) {
77+
test_query21.system();
78+
}
79+
fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {
80+
test_query22.system();
81+
}

crates/bevy_lint/ui/unnecessary_with.stderr

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,147 @@
11
error: Unnecessary `With` Filter
22
--> $DIR/unnecessary_with.rs:10:34
33
|
4-
LL | fn test_query1(_query: Query<&A, With<A>>) {}
4+
LL | fn test_query1(_query: Query<&A, With<A>>) {
55
| ^^^^^^^
66
|
77
= note: `-D unnecessary-with` implied by `-D warnings`
88

99
error: Unnecessary `With` Filter
10-
--> $DIR/unnecessary_with.rs:11:40
10+
--> $DIR/unnecessary_with.rs:13:40
1111
|
12-
LL | fn test_query2(_query: Query<(&A, &B), With<A>>) {}
12+
LL | fn test_query2(_query: Query<(&A, &B), With<A>>) {
1313
| ^^^^^^^
1414

1515
error: Unnecessary `With` Filter
16-
--> $DIR/unnecessary_with.rs:12:40
16+
--> $DIR/unnecessary_with.rs:16:40
1717
|
18-
LL | fn test_query3(_query: Query<(&A, &B), With<B>>) {}
18+
LL | fn test_query3(_query: Query<(&A, &B), With<B>>) {
1919
| ^^^^^^^
2020

2121
error: Unnecessary `With` Filter
22-
--> $DIR/unnecessary_with.rs:13:41
22+
--> $DIR/unnecessary_with.rs:19:41
2323
|
24-
LL | fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {}
24+
LL | fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {
2525
| ^^^^^^^
2626

2727
error: Unnecessary `With` Filter
28-
--> $DIR/unnecessary_with.rs:13:50
28+
--> $DIR/unnecessary_with.rs:19:50
2929
|
30-
LL | fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {}
30+
LL | fn test_query4(_query: Query<(&A, &B), (With<A>, With<B>)>) {
3131
| ^^^^^^^
3232

3333
error: Unnecessary `With` Filter
34-
--> $DIR/unnecessary_with.rs:14:41
34+
--> $DIR/unnecessary_with.rs:22:41
3535
|
36-
LL | fn test_query5(_query: Query<(&A, &B), (With<A>, With<C>)>) {}
36+
LL | fn test_query5(_query: Query<(&A, &B), (With<A>, With<C>)>) {
3737
| ^^^^^^^
3838

3939
error: Unnecessary `With` Filter
40-
--> $DIR/unnecessary_with.rs:15:35
40+
--> $DIR/unnecessary_with.rs:25:35
4141
|
42-
LL | fn test_query6(_query: Query<&A, (With<A>, With<B>)>) {}
42+
LL | fn test_query6(_query: Query<&A, (With<A>, With<B>)>) {
4343
| ^^^^^^^
4444

4545
error: Unnecessary `With` Filter
46-
--> $DIR/unnecessary_with.rs:17:38
46+
--> $DIR/unnecessary_with.rs:29:38
4747
|
48-
LL | fn test_query7(_query: Query<&mut A, With<A>>) {}
48+
LL | fn test_query7(_query: Query<&mut A, With<A>>) {
4949
| ^^^^^^^
5050

5151
error: Unnecessary `With` Filter
52-
--> $DIR/unnecessary_with.rs:18:44
52+
--> $DIR/unnecessary_with.rs:32:44
5353
|
54-
LL | fn test_query8(_query: Query<(&mut A, &B), With<A>>) {}
54+
LL | fn test_query8(_query: Query<(&mut A, &B), With<A>>) {
5555
| ^^^^^^^
5656

5757
error: Unnecessary `With` Filter
58-
--> $DIR/unnecessary_with.rs:19:44
58+
--> $DIR/unnecessary_with.rs:35:44
5959
|
60-
LL | fn test_query9(_query: Query<(&mut A, &B), With<B>>) {}
60+
LL | fn test_query9(_query: Query<(&mut A, &B), With<B>>) {
6161
| ^^^^^^^
6262

6363
error: Unnecessary `With` Filter
64-
--> $DIR/unnecessary_with.rs:20:46
64+
--> $DIR/unnecessary_with.rs:38:46
6565
|
66-
LL | fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {}
66+
LL | fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {
6767
| ^^^^^^^
6868

6969
error: Unnecessary `With` Filter
70-
--> $DIR/unnecessary_with.rs:20:55
70+
--> $DIR/unnecessary_with.rs:38:55
7171
|
72-
LL | fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {}
72+
LL | fn test_query10(_query: Query<(&mut A, &B), (With<A>, With<B>)>) {
7373
| ^^^^^^^
7474

7575
error: Unnecessary `With` Filter
76-
--> $DIR/unnecessary_with.rs:21:46
76+
--> $DIR/unnecessary_with.rs:41:46
7777
|
78-
LL | fn test_query11(_query: Query<(&mut A, &B), (With<A>, With<C>)>) {}
78+
LL | fn test_query11(_query: Query<(&mut A, &B), (With<A>, With<C>)>) {
7979
| ^^^^^^^
8080

8181
error: Unnecessary `With` Filter
82-
--> $DIR/unnecessary_with.rs:22:40
82+
--> $DIR/unnecessary_with.rs:44:40
8383
|
84-
LL | fn test_query12(_query: Query<&mut A, (With<A>, With<B>)>) {}
84+
LL | fn test_query12(_query: Query<&mut A, (With<A>, With<B>)>) {
8585
| ^^^^^^^
8686

8787
error: Unnecessary `With` Filter
88-
--> $DIR/unnecessary_with.rs:24:46
88+
--> $DIR/unnecessary_with.rs:48:46
8989
|
90-
LL | fn test_query13(_query: Query<(), (Added<A>, With<A>)>) {}
90+
LL | fn test_query13(_query: Query<(), (Added<A>, With<A>)>) {
9191
| ^^^^^^^
9292

9393
error: Unnecessary `With` Filter
94-
--> $DIR/unnecessary_with.rs:25:48
94+
--> $DIR/unnecessary_with.rs:51:48
9595
|
96-
LL | fn test_query14(_query: Query<(), (Changed<A>, With<A>)>) {}
96+
LL | fn test_query14(_query: Query<(), (Changed<A>, With<A>)>) {
9797
| ^^^^^^^
9898

9999
error: Unnecessary `With` Filter
100-
--> $DIR/unnecessary_with.rs:27:39
100+
--> $DIR/unnecessary_with.rs:55:39
101101
|
102-
LL | fn test_query15(_query: Query<&A, Or<(With<A>, With<B>)>>) {}
102+
LL | fn test_query15(_query: Query<&A, Or<(With<A>, With<B>)>>) {
103103
| ^^^^^^^
104104

105105
error: Unnecessary `With` Filter
106-
--> $DIR/unnecessary_with.rs:28:48
106+
--> $DIR/unnecessary_with.rs:58:48
107107
|
108-
LL | fn test_query16(_query: Query<&B, Or<(With<A>, With<B>)>>) {}
108+
LL | fn test_query16(_query: Query<&B, Or<(With<A>, With<B>)>>) {
109109
| ^^^^^^^
110110

111111
error: Unnecessary `With` Filter
112-
--> $DIR/unnecessary_with.rs:30:43
112+
--> $DIR/unnecessary_with.rs:62:43
113113
|
114-
LL | fn test_query17(_query: Query<&mut A, Or<(With<A>, With<B>)>>) {}
114+
LL | fn test_query17(_query: Query<&mut A, Or<(With<A>, With<B>)>>) {
115115
| ^^^^^^^
116116

117117
error: Unnecessary `With` Filter
118-
--> $DIR/unnecessary_with.rs:31:52
118+
--> $DIR/unnecessary_with.rs:65:52
119119
|
120-
LL | fn test_query18(_query: Query<&mut B, Or<(With<A>, With<B>)>>) {}
120+
LL | fn test_query18(_query: Query<&mut B, Or<(With<A>, With<B>)>>) {
121121
| ^^^^^^^
122122

123123
error: Unnecessary `With` Filter
124-
--> $DIR/unnecessary_with.rs:33:49
124+
--> $DIR/unnecessary_with.rs:69:49
125125
|
126-
LL | fn test_query19(_query: Query<(), Or<(Added<A>, With<A>)>>) {}
126+
LL | fn test_query19(_query: Query<(), Or<(Added<A>, With<A>)>>) {
127127
| ^^^^^^^
128128

129129
error: Unnecessary `With` Filter
130-
--> $DIR/unnecessary_with.rs:34:51
130+
--> $DIR/unnecessary_with.rs:72:51
131131
|
132-
LL | fn test_query20(_query: Query<(), Or<(Changed<A>, With<A>)>>) {}
132+
LL | fn test_query20(_query: Query<(), Or<(Changed<A>, With<A>)>>) {
133133
| ^^^^^^^
134134

135135
error: Unnecessary `With` Filter
136-
--> $DIR/unnecessary_with.rs:36:40
136+
--> $DIR/unnecessary_with.rs:76:40
137137
|
138-
LL | fn test_query21(_query: Query<&A, (Or<(With<A>, With<B>)>, With<C>)>) {}
138+
LL | fn test_query21(_query: Query<&A, (Or<(With<A>, With<B>)>, With<C>)>) {
139139
| ^^^^^^^
140140

141141
error: Unnecessary `With` Filter
142-
--> $DIR/unnecessary_with.rs:37:44
142+
--> $DIR/unnecessary_with.rs:79:44
143143
|
144-
LL | fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {}
144+
LL | fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {
145145
| ^^^^^^^
146146

147147
error: aborting due to 24 previous errors

0 commit comments

Comments
 (0)