Fix ellipsis_inclusive_range_patterns lint warnings

phansch · phansch · commit 6feef170710b · 2019-06-01T07:54:47.000+02:00
Changed from `allow` to `warn` in rust-lang/rust#61342
diff --git a/tests/ui/match_bool.rs b/tests/ui/match_bool.rs
@@ -44,8 +44,8 @@ fn match_bool() {
 
     // Not linted
     match option {
-        1...10 => 1,
-        11...20 => 2,
+        1..=10 => 1,
+        11..=20 => 2,
         _ => 3,
     };
 }
diff --git a/tests/ui/match_overlapping_arm.rs b/tests/ui/match_overlapping_arm.rs
@@ -8,33 +8,33 @@ 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!("0 ... 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"),
         _ => (),
     }
 
@@ -52,7 +52,7 @@ fn overlapping() {
 
     match 42 {
         0..11 => println!("0 .. 11"),
-        0...11 => println!("0 ... 11"),
+        0..=11 => println!("0 ... 11"),
         _ => (),
     }
 
diff --git a/tests/ui/match_overlapping_arm.stderr b/tests/ui/match_overlapping_arm.stderr
@@ -1,32 +1,32 @@
 error: some ranges overlap
   --> $DIR/match_overlapping_arm.rs:11: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:12:9
    |
-LL |         0...11 => println!("0 ... 11"),
+LL |         0..=11 => println!("0 ... 11"),
    |         ^^^^^^
 
 error: some ranges overlap
   --> $DIR/match_overlapping_arm.rs:17:9
    |
-LL |         0...5 => println!("0 ... 5"),
+LL |         0..=5 => println!("0 ... 5"),
    |         ^^^^^
    |
 note: overlaps with this
   --> $DIR/match_overlapping_arm.rs:19:9
    |
-LL |         FOO...11 => println!("0 ... 11"),
+LL |         FOO..=11 => println!("0 ... 11"),
    |         ^^^^^^^^
 
 error: some ranges overlap
   --> $DIR/match_overlapping_arm.rs:25:9
    |
-LL |         0...5 => println!("0 ... 5"),
+LL |         0..=5 => println!("0 ... 5"),
    |         ^^^^^
    |
 note: overlaps with this
@@ -38,7 +38,7 @@ LL |         2 => println!("2"),
 error: some ranges overlap
   --> $DIR/match_overlapping_arm.rs:31:9
    |
-LL |         0...2 => println!("0 ... 2"),
+LL |         0..=2 => println!("0 ... 2"),
    |         ^^^^^
    |
 note: overlaps with this
@@ -56,7 +56,7 @@ LL |         0..11 => println!("0 .. 11"),
 note: overlaps with this
   --> $DIR/match_overlapping_arm.rs:55:9
    |
-LL |         0...11 => println!("0 ... 11"),
+LL |         0..=11 => println!("0 ... 11"),
    |         ^^^^^^
 
 error: aborting due to 5 previous errors
diff --git a/tests/ui/single_match.rs b/tests/ui/single_match.rs
@@ -23,7 +23,7 @@ fn single_match() {
 
     let z = (1u8, 1u8);
     match z {
-        (2...3, 7...9) => dummy(),
+        (2..=3, 7..=9) => dummy(),
         _ => {},
     };
 
@@ -35,7 +35,7 @@ fn single_match() {
 
     // Not linted (no block with statements in the single arm)
     match z {
-        (2...3, 7...9) => println!("{:?}", z),
+        (2..=3, 7..=9) => println!("{:?}", z),
         _ => println!("nope"),
     }
 }
diff --git a/tests/ui/single_match.stderr b/tests/ui/single_match.stderr
@@ -33,10 +33,10 @@ error: you seem to be trying to use match for destructuring a single pattern. Co
   --> $DIR/single_match.rs:25:5
    |
 LL | /     match z {
-LL | |         (2...3, 7...9) => dummy(),
+LL | |         (2..=3, 7..=9) => dummy(),
 LL | |         _ => {},
 LL | |     };
-   | |_____^ help: try this: `if let (2...3, 7...9) = z { dummy() }`
+   | |_____^ help: try this: `if let (2..=3, 7..=9) = z { dummy() }`
 
 error: you seem to be trying to use match for destructuring a single pattern. Consider using `if let`
   --> $DIR/single_match.rs:54:5

Original file line number	Diff line number	Diff line change
`@@ -1,32 +1,32 @@`
`1`	`1`	`error: some ranges overlap`
`2`	`2`	`--> $DIR/match_overlapping_arm.rs:11: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:12: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:17: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:19:9`
`22`	`22`	`\|`
`23`		`-LL \| FOO...11 => println!("0 ... 11"),`
	`23`	`+LL \| FOO..=11 => println!("0 ... 11"),`
`24`	`24`	`\| ^^^^^^^^`
`25`	`25`
`26`	`26`	`error: some ranges overlap`
`27`	`27`	`--> $DIR/match_overlapping_arm.rs:25:9`
`28`	`28`	`\|`
`29`		`-LL \| 0...5 => println!("0 ... 5"),`
	`29`	`+LL \| 0..=5 => println!("0 ... 5"),`
`30`	`30`	`\| ^^^^^`
`31`	`31`	`\|`
`32`	`32`	`note: overlaps with this`
`@@ -38,7 +38,7 @@ LL \| 2 => println!("2"),`
`38`	`38`	`error: some ranges overlap`
`39`	`39`	`--> $DIR/match_overlapping_arm.rs:31:9`
`40`	`40`	`\|`
`41`		`-LL \| 0...2 => println!("0 ... 2"),`
	`41`	`+LL \| 0..=2 => println!("0 ... 2"),`
`42`	`42`	`\| ^^^^^`
`43`	`43`	`\|`
`44`	`44`	`note: overlaps with this`
`@@ -56,7 +56,7 @@ LL \| 0..11 => println!("0 .. 11"),`
`56`	`56`	`note: overlaps with this`
`57`	`57`	`--> $DIR/match_overlapping_arm.rs:55:9`
`58`	`58`	`\|`
`59`		`-LL \| 0...11 => println!("0 ... 11"),`
	`59`	`+LL \| 0..=11 => println!("0 ... 11"),`
`60`	`60`	`\| ^^^^^^`
`61`	`61`
`62`	`62`	`error: aborting due to 5 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ fn single_match() {`
`23`	`23`
`24`	`24`	`let z = (1u8, 1u8);`
`25`	`25`	`match z {`
`26`		`- (2...3, 7...9) => dummy(),`
	`26`	`+ (2..=3, 7..=9) => dummy(),`
`27`	`27`	`_ => {},`
`28`	`28`	`};`
`29`	`29`
`@@ -35,7 +35,7 @@ fn single_match() {`
`35`	`35`
`36`	`36`	`// Not linted (no block with statements in the single arm)`
`37`	`37`	`match z {`
`38`		`- (2...3, 7...9) => println!("{:?}", z),`
	`38`	`+ (2..=3, 7..=9) => println!("{:?}", z),`
`39`	`39`	`_ => println!("nope"),`
`40`	`40`	`}`
`41`	`41`	`}`