Skip to content

Commit db403bb

Browse files
borsbors
committed
Auto merge of #7823 - mikerite:match-overlapping-arm-20211015, r=xFrednet
Some small improvements to the `match_overlapping_arm` tests changelog: none
2 parents 70f36e0 + 28a249b commit db403bb

File tree

2 files changed

+51
-42
lines changed

2 files changed

+51
-42
lines changed

‎tests/ui/match_overlapping_arm.rs

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,98 +10,95 @@ fn overlapping() {
1010
const FOO: u64 = 2;
1111

1212
match 42 {
13-
0..=10 => println!("0 ... 10"),
14-
0..=11 => println!("0 ... 11"),
13+
0..=10 => println!("0..=10"),
14+
0..=11 => println!("0..=11"),
1515
_ => (),
1616
}
1717

1818
match 42 {
19-
0..=5 => println!("0 ... 5"),
20-
6..=7 => println!("6 ... 7"),
21-
FOO..=11 => println!("0 ... 11"),
19+
0..=5 => println!("0..=5"),
20+
6..=7 => println!("6..=7"),
21+
FOO..=11 => println!("FOO..=11"),
2222
_ => (),
2323
}
2424

2525
match 42 {
2626
2 => println!("2"),
27-
0..=5 => println!("0 ... 5"),
27+
0..=5 => println!("0..=5"),
2828
_ => (),
2929
}
3030

3131
match 42 {
3232
2 => println!("2"),
33-
0..=2 => println!("0 ... 2"),
33+
0..=2 => println!("0..=2"),
3434
_ => (),
3535
}
3636

3737
match 42 {
38-
0..=10 => println!("0 ... 10"),
39-
11..=50 => println!("11 ... 50"),
38+
0..=10 => println!("0..=10"),
39+
11..=50 => println!("11..=50"),
4040
_ => (),
4141
}
4242

4343
match 42 {
4444
2 => println!("2"),
45-
0..2 => println!("0 .. 2"),
45+
0..2 => println!("0..2"),
4646
_ => (),
4747
}
4848

4949
match 42 {
50-
0..10 => println!("0 .. 10"),
51-
10..50 => println!("10 .. 50"),
50+
0..10 => println!("0..10"),
51+
10..50 => println!("10..50"),
5252
_ => (),
5353
}
5454

5555
match 42 {
56-
0..11 => println!("0 .. 11"),
57-
0..=11 => println!("0 ... 11"),
56+
0..11 => println!("0..11"),
57+
0..=11 => println!("0..=11"),
5858
_ => (),
5959
}
6060

6161
match 42 {
62-
5..7 => println!("5 .. 7"),
63-
0..10 => println!("0 .. 10"),
62+
5..7 => println!("5..7"),
63+
0..10 => println!("0..10"),
6464
_ => (),
6565
}
6666

6767
match 42 {
68-
5..10 => println!("5 .. 10"),
69-
0..=10 => println!("0 ... 10"),
68+
5..10 => println!("5..10"),
69+
0..=10 => println!("0..=10"),
7070
_ => (),
7171
}
7272

7373
match 42 {
74-
0..14 => println!("0 .. 14"),
75-
5..10 => println!("5 .. 10"),
74+
0..14 => println!("0..14"),
75+
5..10 => println!("5..10"),
7676
_ => (),
7777
}
7878

7979
match 42 {
80-
5..14 => println!("5 .. 14"),
81-
0..=10 => println!("0 ... 10"),
80+
5..14 => println!("5..14"),
81+
0..=10 => println!("0..=10"),
8282
_ => (),
8383
}
8484

8585
match 42 {
86-
0..7 => println!("0 .. 7"),
87-
0..=10 => println!("0 ... 10"),
86+
0..7 => println!("0..7"),
87+
0..=10 => println!("0..=10"),
8888
_ => (),
8989
}
9090

91-
/*
92-
// FIXME(JohnTitor): uncomment this once rustfmt knows half-open patterns
9391
match 42 {
94-
0.. => println!("0 .. 42"),
95-
3.. => println!("3 .. 42"),
92+
3.. => println!("3.."),
93+
0.. => println!("0.."),
9694
_ => (),
9795
}
9896

9997
match 42 {
100-
..=23 => println!("0 ... 23"),
101-
..26 => println!("0 .. 26"),
98+
..=23 => println!("..=23"),
99+
..26 => println!("..26"),
102100
_ => (),
103101
}
104-
*/
105102

106103
if let None = Some(42) {
107104
// nothing

‎tests/ui/match_overlapping_arm.stderr

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,75 @@
11
error: some ranges overlap
22
--> $DIR/match_overlapping_arm.rs:13:9
33
|
4-
LL | 0..=10 => println!("0 ... 10"),
4+
LL | 0..=10 => println!("0..=10"),
55
| ^^^^^^
66
|
77
= note: `-D clippy::match-overlapping-arm` implied by `-D warnings`
88
note: overlaps with this
99
--> $DIR/match_overlapping_arm.rs:14:9
1010
|
11-
LL | 0..=11 => println!("0 ... 11"),
11+
LL | 0..=11 => println!("0..=11"),
1212
| ^^^^^^
1313

1414
error: some ranges overlap
1515
--> $DIR/match_overlapping_arm.rs:19:9
1616
|
17-
LL | 0..=5 => println!("0 ... 5"),
17+
LL | 0..=5 => println!("0..=5"),
1818
| ^^^^^
1919
|
2020
note: overlaps with this
2121
--> $DIR/match_overlapping_arm.rs:21:9
2222
|
23-
LL | FOO..=11 => println!("0 ... 11"),
23+
LL | FOO..=11 => println!("FOO..=11"),
2424
| ^^^^^^^^
2525

2626
error: some ranges overlap
2727
--> $DIR/match_overlapping_arm.rs:56:9
2828
|
29-
LL | 0..11 => println!("0 .. 11"),
29+
LL | 0..11 => println!("0..11"),
3030
| ^^^^^
3131
|
3232
note: overlaps with this
3333
--> $DIR/match_overlapping_arm.rs:57:9
3434
|
35-
LL | 0..=11 => println!("0 ... 11"),
35+
LL | 0..=11 => println!("0..=11"),
3636
| ^^^^^^
3737

3838
error: some ranges overlap
3939
--> $DIR/match_overlapping_arm.rs:81:9
4040
|
41-
LL | 0..=10 => println!("0 ... 10"),
41+
LL | 0..=10 => println!("0..=10"),
4242
| ^^^^^^
4343
|
4444
note: overlaps with this
4545
--> $DIR/match_overlapping_arm.rs:80:9
4646
|
47-
LL | 5..14 => println!("5 .. 14"),
47+
LL | 5..14 => println!("5..14"),
4848
| ^^^^^
4949

5050
error: some ranges overlap
5151
--> $DIR/match_overlapping_arm.rs:86:9
5252
|
53-
LL | 0..7 => println!("0 .. 7"),
53+
LL | 0..7 => println!("0..7"),
5454
| ^^^^
5555
|
5656
note: overlaps with this
5757
--> $DIR/match_overlapping_arm.rs:87:9
5858
|
59-
LL | 0..=10 => println!("0 ... 10"),
59+
LL | 0..=10 => println!("0..=10"),
6060
| ^^^^^^
6161

62-
error: aborting due to 5 previous errors
62+
error: some ranges overlap
63+
--> $DIR/match_overlapping_arm.rs:98:9
64+
|
65+
LL | ..=23 => println!("..=23"),
66+
| ^^^^^
67+
|
68+
note: overlaps with this
69+
--> $DIR/match_overlapping_arm.rs:99:9
70+
|
71+
LL | ..26 => println!("..26"),
72+
| ^^^^
73+
74+
error: aborting due to 6 previous errors
6375

0 commit comments

Comments
 (0)