user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #7823 - mikerite:match-overlapping-arm-20211015, r=xFrednet

Browse source 
Some small improvements to the `match_overlapping_arm` tests

changelog: none
This commit is contained in:
bors 2021-10-15 12:42:16 +00:00
commit db403bb889
2 changed files with 55 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

67
tests/ui/match_overlapping_arm.rs
View file

@ -10,98 +10,95 @@ fn overlapping() {
const FOO: u64 = 2;
match 42 {
0..=10 => println!("0 ... 10"),
0..=11 => println!("0 ... 11"),
0..=10 => println!("0..=10"),
0..=11 => println!("0..=11"),
_ => (),
}
match 42 {
0..=5 => println!("0 ... 5"),
6..=7 => println!("6 ... 7"),
FOO..=11 => println!("0 ... 11"),
0..=5 => println!("0..=5"),
6..=7 => println!("6..=7"),
FOO..=11 => println!("FOO..=11"),
_ => (),
}
match 42 {
2 => println!("2"),
0..=5 => println!("0 ... 5"),
0..=5 => println!("0..=5"),
_ => (),
}
match 42 {
2 => println!("2"),
0..=2 => println!("0 ... 2"),
0..=2 => println!("0..=2"),
_ => (),
}
match 42 {
0..=10 => println!("0 ... 10"),
11..=50 => println!("11 ... 50"),
0..=10 => println!("0..=10"),
11..=50 => println!("11..=50"),
_ => (),
}
match 42 {
2 => println!("2"),
0..2 => println!("0 .. 2"),
0..2 => println!("0..2"),
_ => (),
}
match 42 {
0..10 => println!("0 .. 10"),
10..50 => println!("10 .. 50"),
0..10 => println!("0..10"),
10..50 => println!("10..50"),
_ => (),
}
match 42 {
0..11 => println!("0 .. 11"),
0..=11 => println!("0 ... 11"),
0..11 => println!("0..11"),
0..=11 => println!("0..=11"),
_ => (),
}
match 42 {
5..7 => println!("5 .. 7"),
0..10 => println!("0 .. 10"),
5..7 => println!("5..7"),
0..10 => println!("0..10"),
_ => (),
}
match 42 {
5..10 => println!("5 .. 10"),
0..=10 => println!("0 ... 10"),
5..10 => println!("5..10"),
0..=10 => println!("0..=10"),
_ => (),
}
match 42 {
0..14 => println!("0 .. 14"),
5..10 => println!("5 .. 10"),
0..14 => println!("0..14"),
5..10 => println!("5..10"),
_ => (),
}
match 42 {
5..14 => println!("5 .. 14"),
0..=10 => println!("0 ... 10"),
5..14 => println!("5..14"),
0..=10 => println!("0..=10"),
_ => (),
}
match 42 {
0..7 => println!("0 .. 7"),
0..=10 => println!("0 ... 10"),
_ => (),
}
/*
// FIXME(JohnTitor): uncomment this once rustfmt knows half-open patterns
match 42 {
0.. => println!("0 .. 42"),
3.. => println!("3 .. 42"),
0..7 => println!("0..7"),
0..=10 => println!("0..=10"),
_ => (),
}
match 42 {
..=23 => println!("0 ... 23"),
..26 => println!("0 .. 26"),
3.. => println!("3.."),
0.. => println!("0.."),
_ => (),
}
match 42 {
..=23 => println!("..=23"),
..26 => println!("..26"),
_ => (),
}
*/
if let None = Some(42) {
// nothing

34
tests/ui/match_overlapping_arm.stderr
View file

@ -1,63 +1,75 @@
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:13:9
|
LL | 0..=10 => println!("0 ... 10"),
LL | 0..=10 => println!("0..=10"),
| ^^^^^^
|
= note: `-D clippy::match-overlapping-arm` implied by `-D warnings`
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:14:9
|
LL | 0..=11 => println!("0 ... 11"),
LL | 0..=11 => println!("0..=11"),
| ^^^^^^
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:19:9
|
LL | 0..=5 => println!("0 ... 5"),
LL | 0..=5 => println!("0..=5"),
| ^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:21:9
|
LL | FOO..=11 => println!("0 ... 11"),
LL | FOO..=11 => println!("FOO..=11"),
| ^^^^^^^^
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:56:9
|
LL | 0..11 => println!("0 .. 11"),
LL | 0..11 => println!("0..11"),
| ^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:57:9
|
LL | 0..=11 => println!("0 ... 11"),
LL | 0..=11 => println!("0..=11"),
| ^^^^^^
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:81:9
|
LL | 0..=10 => println!("0 ... 10"),
LL | 0..=10 => println!("0..=10"),
| ^^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:80:9
|
LL | 5..14 => println!("5 .. 14"),
LL | 5..14 => println!("5..14"),
| ^^^^^
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:86:9
|
LL | 0..7 => println!("0 .. 7"),
LL | 0..7 => println!("0..7"),
| ^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:87:9
|
LL | 0..=10 => println!("0 ... 10"),
LL | 0..=10 => println!("0..=10"),
| ^^^^^^
error: aborting due to 5 previous errors
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:98:9
|
LL | ..=23 => println!("..=23"),
| ^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:99:9
|
LL | ..26 => println!("..26"),
| ^^^^
error: aborting due to 6 previous errors