about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNadrieril <nadrieril+git@gmail.com>2020-10-22 19:25:55 +0100
committerNadrieril <nadrieril+git@gmail.com>2020-11-29 21:29:19 +0000
commitc89d439bb5c18608054d767e5b472679fa2f01da (patch)
treea245ca975e03bf6cf0a137e709d92a78db223bba /src
parentd1a50ffb7c332677f3c613540d507114c83e0f86 (diff)
downloadrust-c89d439bb5c18608054d767e5b472679fa2f01da.tar.gz
rust-c89d439bb5c18608054d767e5b472679fa2f01da.zip
Be consistent about linting singletons
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs4
-rw-r--r--src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr18
2 files changed, 3 insertions, 19 deletions
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs b/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
index 6ad87d873ee..5ea92b07081 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
+++ b/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.rs
@@ -29,9 +29,9 @@ fn main() {
     m!(0u8, 20..=30, 25);
     m!(0u8, 20..=30, 30);
     m!(0u8, 20.. 30, 29);
-    m!(0u8, 20, 20..=30); //~ ERROR multiple patterns overlap on their endpoints
+    m!(0u8, 20, 20..=30);
     m!(0u8, 25, 20..=30);
-    m!(0u8, 30, 20..=30); //~ ERROR multiple patterns overlap on their endpoints
+    m!(0u8, 30, 20..=30);
 
     match 0u8 {
         0..=10 => {}
diff --git a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr b/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
index 56995421f2b..f694e4c9aab 100644
--- a/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
+++ b/src/test/ui/pattern/usefulness/integer-ranges/overlapping_range_endpoints.stderr
@@ -45,22 +45,6 @@ LL |     m!(0u8, 20..=30, 19..=20);
    |             this range overlaps on `20_u8`
 
 error: multiple patterns overlap on their endpoints
-  --> $DIR/overlapping_range_endpoints.rs:32:17
-   |
-LL |     m!(0u8, 20, 20..=30);
-   |             --  ^^^^^^^ overlapping range endpoints
-   |             |
-   |             this range overlaps on `20_u8`
-
-error: multiple patterns overlap on their endpoints
-  --> $DIR/overlapping_range_endpoints.rs:34:17
-   |
-LL |     m!(0u8, 30, 20..=30);
-   |             --  ^^^^^^^ overlapping range endpoints
-   |             |
-   |             this range overlaps on `30_u8`
-
-error: multiple patterns overlap on their endpoints
   --> $DIR/overlapping_range_endpoints.rs:39:9
    |
 LL |         0..=10 => {}
@@ -86,5 +70,5 @@ LL |         Some(0..=10) => {}
 LL |         Some(10..20) => {}
    |              ^^^^^^ overlapping range endpoints
 
-error: aborting due to 10 previous errors
+error: aborting due to 8 previous errors