Refactor overlapping arm tests

Michael Wright · Michael Wright · commit e664a76add16 · 2021-10-15T06:20:28.000+02:00
Make the `println!`s match the patterns. Currently they are using the
deprecated syntax for inclusive ranges and extra spacing.
diff --git a/tests/ui/match_overlapping_arm.rs b/tests/ui/match_overlapping_arm.rs
@@ -10,81 +10,81 @@ 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"),
+        0..7 => println!("0..7"),
+        0..=10 => println!("0..=10"),
         _ => (),
     }
 
diff --git a/tests/ui/match_overlapping_arm.stderr b/tests/ui/match_overlapping_arm.stderr
@@ -1,62 +1,62 @@
 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

Original file line number	Diff line number	Diff line change
`@@ -1,62 +1,62 @@`
`1`	`1`	`error: some ranges overlap`
`2`	`2`	`--> $DIR/match_overlapping_arm.rs:13:9`
`3`	`3`	`\|`
`4`		`-LL \| 0..=10 => println!("0 ... 10"),`
	`4`	`+LL \| 0..=10 => println!("0..=10"),`
`5`	`5`	`\| ^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::match-overlapping-arm` implied by `-D warnings`
`8`	`8`	`note: overlaps with this`
`9`	`9`	`--> $DIR/match_overlapping_arm.rs:14:9`
`10`	`10`	`\|`
`11`		`-LL \| 0..=11 => println!("0 ... 11"),`
	`11`	`+LL \| 0..=11 => println!("0..=11"),`
`12`	`12`	`\| ^^^^^^`
`13`	`13`
`14`	`14`	`error: some ranges overlap`
`15`	`15`	`--> $DIR/match_overlapping_arm.rs:19:9`
`16`	`16`	`\|`
`17`		`-LL \| 0..=5 => println!("0 ... 5"),`
	`17`	`+LL \| 0..=5 => println!("0..=5"),`
`18`	`18`	`\| ^^^^^`
`19`	`19`	`\|`
`20`	`20`	`note: overlaps with this`
`21`	`21`	`--> $DIR/match_overlapping_arm.rs:21:9`
`22`	`22`	`\|`
`23`		`-LL \| FOO..=11 => println!("0 ... 11"),`
	`23`	`+LL \| FOO..=11 => println!("FOO..=11"),`
`24`	`24`	`\| ^^^^^^^^`
`25`	`25`
`26`	`26`	`error: some ranges overlap`
`27`	`27`	`--> $DIR/match_overlapping_arm.rs:56:9`
`28`	`28`	`\|`
`29`		`-LL \| 0..11 => println!("0 .. 11"),`
	`29`	`+LL \| 0..11 => println!("0..11"),`
`30`	`30`	`\| ^^^^^`
`31`	`31`	`\|`
`32`	`32`	`note: overlaps with this`
`33`	`33`	`--> $DIR/match_overlapping_arm.rs:57:9`
`34`	`34`	`\|`
`35`		`-LL \| 0..=11 => println!("0 ... 11"),`
	`35`	`+LL \| 0..=11 => println!("0..=11"),`
`36`	`36`	`\| ^^^^^^`
`37`	`37`
`38`	`38`	`error: some ranges overlap`
`39`	`39`	`--> $DIR/match_overlapping_arm.rs:81:9`
`40`	`40`	`\|`
`41`		`-LL \| 0..=10 => println!("0 ... 10"),`
	`41`	`+LL \| 0..=10 => println!("0..=10"),`
`42`	`42`	`\| ^^^^^^`
`43`	`43`	`\|`
`44`	`44`	`note: overlaps with this`
`45`	`45`	`--> $DIR/match_overlapping_arm.rs:80:9`
`46`	`46`	`\|`
`47`		`-LL \| 5..14 => println!("5 .. 14"),`
	`47`	`+LL \| 5..14 => println!("5..14"),`
`48`	`48`	`\| ^^^^^`
`49`	`49`
`50`	`50`	`error: some ranges overlap`
`51`	`51`	`--> $DIR/match_overlapping_arm.rs:86:9`
`52`	`52`	`\|`
`53`		`-LL \| 0..7 => println!("0 .. 7"),`
	`53`	`+LL \| 0..7 => println!("0..7"),`
`54`	`54`	`\| ^^^^`
`55`	`55`	`\|`
`56`	`56`	`note: overlaps with this`
`57`	`57`	`--> $DIR/match_overlapping_arm.rs:87:9`
`58`	`58`	`\|`
`59`		`-LL \| 0..=10 => println!("0 ... 10"),`
	`59`	`+LL \| 0..=10 => println!("0..=10"),`
`60`	`60`	`\| ^^^^^^`
`61`	`61`
`62`	`62`	`error: aborting due to 5 previous errors`