Skip to content

Commit 26a873b

Browse files
CentrilCentril
committed
split unnested_or_patterns test
1 parent 2a9220a commit 26a873b

6 files changed

+128
-105
lines changed

‎tests/ui/unnested_or_patterns.fixed

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,4 @@ fn main() {
3030
}
3131
if let S { x: 0 | 1, y } = (S { x: 0, y: 1 }) {}
3232
if let S { x: 0, y, .. } | S { y, x: 1 } = (S { x: 0, y: 1 }) {}
33-
if let Some(Some(0 | 1)) = None {}
34-
if let Some(Some(0 | 1 | 2)) = None {}
35-
if let Some(Some(0 | 1 | 2 | 3 | 4)) = None {}
36-
if let Some(Some(0 | 1 | 2)) = None {}
37-
if let ((0 | 1 | 2,),) = ((0,),) {}
38-
if let 0 | 1 | 2 = 0 {}
39-
if let box (0 | 1 | 2 | 3 | 4) = Box::new(0) {}
40-
if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
4133
}

‎tests/ui/unnested_or_patterns.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,4 @@ fn main() {
3030
}
3131
if let S { x: 0, y } | S { y, x: 1 } = (S { x: 0, y: 1 }) {}
3232
if let S { x: 0, y, .. } | S { y, x: 1 } = (S { x: 0, y: 1 }) {}
33-
if let Some(Some(0)) | Some(Some(1)) = None {}
34-
if let Some(Some(0)) | Some(Some(1) | Some(2)) = None {}
35-
if let Some(Some(0 | 1) | Some(2)) | Some(Some(3) | Some(4)) = None {}
36-
if let Some(Some(0) | Some(1 | 2)) = None {}
37-
if let ((0,),) | ((1,) | (2,),) = ((0,),) {}
38-
if let 0 | (1 | 2) = 0 {}
39-
if let box (0 | 1) | (box 2 | box (3 | 4)) = Box::new(0) {}
40-
if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
4133
}

‎tests/ui/unnested_or_patterns.stderr

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -175,93 +175,5 @@ help: nest the patterns
175175
LL | if let S { x: 0 | 1, y } = (S { x: 0, y: 1 }) {}
176176
| ^^^^^^^^^^^^^^^^^
177177

178-
error: unnested or-patterns
179-
--> $DIR/unnested_or_patterns.rs:33:12
180-
|
181-
LL | if let Some(Some(0)) | Some(Some(1)) = None {}
182-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
183-
|
184-
help: nest the patterns
185-
|
186-
LL | if let Some(Some(0 | 1)) = None {}
187-
| ^^^^^^^^^^^^^^^^^
188-
189-
error: unnested or-patterns
190-
--> $DIR/unnested_or_patterns.rs:34:12
191-
|
192-
LL | if let Some(Some(0)) | Some(Some(1) | Some(2)) = None {}
193-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
194-
|
195-
help: nest the patterns
196-
|
197-
LL | if let Some(Some(0 | 1 | 2)) = None {}
198-
| ^^^^^^^^^^^^^^^^^^^^^
199-
200-
error: unnested or-patterns
201-
--> $DIR/unnested_or_patterns.rs:35:12
202-
|
203-
LL | if let Some(Some(0 | 1) | Some(2)) | Some(Some(3) | Some(4)) = None {}
204-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
205-
|
206-
help: nest the patterns
207-
|
208-
LL | if let Some(Some(0 | 1 | 2 | 3 | 4)) = None {}
209-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
210-
211-
error: unnested or-patterns
212-
--> $DIR/unnested_or_patterns.rs:36:12
213-
|
214-
LL | if let Some(Some(0) | Some(1 | 2)) = None {}
215-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
216-
|
217-
help: nest the patterns
218-
|
219-
LL | if let Some(Some(0 | 1 | 2)) = None {}
220-
| ^^^^^^^^^^^^^^^^^^^^^
221-
222-
error: unnested or-patterns
223-
--> $DIR/unnested_or_patterns.rs:37:12
224-
|
225-
LL | if let ((0,),) | ((1,) | (2,),) = ((0,),) {}
226-
| ^^^^^^^^^^^^^^^^^^^^^^^^
227-
|
228-
help: nest the patterns
229-
|
230-
LL | if let ((0 | 1 | 2,),) = ((0,),) {}
231-
| ^^^^^^^^^^^^^^^
232-
233-
error: unnested or-patterns
234-
--> $DIR/unnested_or_patterns.rs:38:12
235-
|
236-
LL | if let 0 | (1 | 2) = 0 {}
237-
| ^^^^^^^^^^^
238-
|
239-
help: nest the patterns
240-
|
241-
LL | if let 0 | 1 | 2 = 0 {}
242-
| ^^^^^^^^^
243-
244-
error: unnested or-patterns
245-
--> $DIR/unnested_or_patterns.rs:39:12
246-
|
247-
LL | if let box (0 | 1) | (box 2 | box (3 | 4)) = Box::new(0) {}
248-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
249-
|
250-
help: nest the patterns
251-
|
252-
LL | if let box (0 | 1 | 2 | 3 | 4) = Box::new(0) {}
253-
| ^^^^^^^^^^^^^^^^^^^^^^^
254-
255-
error: unnested or-patterns
256-
--> $DIR/unnested_or_patterns.rs:40:12
257-
|
258-
LL | if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
259-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
260-
|
261-
help: nest the patterns
262-
|
263-
LL | if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
264-
| ^^^^^^^^^^^^^^^^^^^
265-
266-
error: aborting due to 24 previous errors
178+
error: aborting due to 16 previous errors
267179

‎tests/ui/unnested_or_patterns2.fixed

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// run-rustfix
2+
3+
#![feature(or_patterns)]
4+
#![feature(box_patterns)]
5+
#![warn(clippy::unnested_or_patterns)]
6+
#![allow(clippy::cognitive_complexity, clippy::match_ref_pats)]
7+
#![allow(unreachable_patterns, irrefutable_let_patterns, unused_variables)]
8+
9+
fn main() {
10+
if let Some(Some(0 | 1)) = None {}
11+
if let Some(Some(0 | 1 | 2)) = None {}
12+
if let Some(Some(0 | 1 | 2 | 3 | 4)) = None {}
13+
if let Some(Some(0 | 1 | 2)) = None {}
14+
if let ((0 | 1 | 2,),) = ((0,),) {}
15+
if let 0 | 1 | 2 = 0 {}
16+
if let box (0 | 1 | 2 | 3 | 4) = Box::new(0) {}
17+
if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
18+
}

‎tests/ui/unnested_or_patterns2.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// run-rustfix
2+
3+
#![feature(or_patterns)]
4+
#![feature(box_patterns)]
5+
#![warn(clippy::unnested_or_patterns)]
6+
#![allow(clippy::cognitive_complexity, clippy::match_ref_pats)]
7+
#![allow(unreachable_patterns, irrefutable_let_patterns, unused_variables)]
8+
9+
fn main() {
10+
if let Some(Some(0)) | Some(Some(1)) = None {}
11+
if let Some(Some(0)) | Some(Some(1) | Some(2)) = None {}
12+
if let Some(Some(0 | 1) | Some(2)) | Some(Some(3) | Some(4)) = None {}
13+
if let Some(Some(0) | Some(1 | 2)) = None {}
14+
if let ((0,),) | ((1,) | (2,),) = ((0,),) {}
15+
if let 0 | (1 | 2) = 0 {}
16+
if let box (0 | 1) | (box 2 | box (3 | 4)) = Box::new(0) {}
17+
if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
18+
}

‎tests/ui/unnested_or_patterns2.stderr

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
error: unnested or-patterns
2+
--> $DIR/unnested_or_patterns2.rs:10:12
3+
|
4+
LL | if let Some(Some(0)) | Some(Some(1)) = None {}
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= note: `-D clippy::unnested-or-patterns` implied by `-D warnings`
8+
help: nest the patterns
9+
|
10+
LL | if let Some(Some(0 | 1)) = None {}
11+
| ^^^^^^^^^^^^^^^^^
12+
13+
error: unnested or-patterns
14+
--> $DIR/unnested_or_patterns2.rs:11:12
15+
|
16+
LL | if let Some(Some(0)) | Some(Some(1) | Some(2)) = None {}
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
|
19+
help: nest the patterns
20+
|
21+
LL | if let Some(Some(0 | 1 | 2)) = None {}
22+
| ^^^^^^^^^^^^^^^^^^^^^
23+
24+
error: unnested or-patterns
25+
--> $DIR/unnested_or_patterns2.rs:12:12
26+
|
27+
LL | if let Some(Some(0 | 1) | Some(2)) | Some(Some(3) | Some(4)) = None {}
28+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
29+
|
30+
help: nest the patterns
31+
|
32+
LL | if let Some(Some(0 | 1 | 2 | 3 | 4)) = None {}
33+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
34+
35+
error: unnested or-patterns
36+
--> $DIR/unnested_or_patterns2.rs:13:12
37+
|
38+
LL | if let Some(Some(0) | Some(1 | 2)) = None {}
39+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
40+
|
41+
help: nest the patterns
42+
|
43+
LL | if let Some(Some(0 | 1 | 2)) = None {}
44+
| ^^^^^^^^^^^^^^^^^^^^^
45+
46+
error: unnested or-patterns
47+
--> $DIR/unnested_or_patterns2.rs:14:12
48+
|
49+
LL | if let ((0,),) | ((1,) | (2,),) = ((0,),) {}
50+
| ^^^^^^^^^^^^^^^^^^^^^^^^
51+
|
52+
help: nest the patterns
53+
|
54+
LL | if let ((0 | 1 | 2,),) = ((0,),) {}
55+
| ^^^^^^^^^^^^^^^
56+
57+
error: unnested or-patterns
58+
--> $DIR/unnested_or_patterns2.rs:15:12
59+
|
60+
LL | if let 0 | (1 | 2) = 0 {}
61+
| ^^^^^^^^^^^
62+
|
63+
help: nest the patterns
64+
|
65+
LL | if let 0 | 1 | 2 = 0 {}
66+
| ^^^^^^^^^
67+
68+
error: unnested or-patterns
69+
--> $DIR/unnested_or_patterns2.rs:16:12
70+
|
71+
LL | if let box (0 | 1) | (box 2 | box (3 | 4)) = Box::new(0) {}
72+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
73+
|
74+
help: nest the patterns
75+
|
76+
LL | if let box (0 | 1 | 2 | 3 | 4) = Box::new(0) {}
77+
| ^^^^^^^^^^^^^^^^^^^^^^^
78+
79+
error: unnested or-patterns
80+
--> $DIR/unnested_or_patterns2.rs:17:12
81+
|
82+
LL | if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
83+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
84+
|
85+
help: nest the patterns
86+
|
87+
LL | if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
88+
| ^^^^^^^^^^^^^^^^^^^
89+
90+
error: aborting due to 8 previous errors
91+

0 commit comments

Comments
 (0)