about summary refs log tree commit diff
path: root/src/test/ui/or-patterns
diff options
context:
space:
mode:
authorNadrieril <nadrieril+git@gmail.com>2020-12-17 01:07:49 +0000
committerNadrieril <nadrieril+git@gmail.com>2020-12-18 16:21:38 +0000
commitd7a6365b77e171337d4f4220ebdc618965524ecd (patch)
treecb0d54181b9e67bef53ac29325f04995674d63c4 /src/test/ui/or-patterns
parent170fae2c187936498ffdebbbd7e3cad47af31cc9 (diff)
downloadrust-d7a6365b77e171337d4f4220ebdc618965524ecd.tar.gz
rust-d7a6365b77e171337d4f4220ebdc618965524ecd.zip
Rewrite usefulness merging using `SpanSet`
`SpanSet` is heavily inspired from `DefIdForest`.
Diffstat (limited to 'src/test/ui/or-patterns')
-rw-r--r--src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs2
-rw-r--r--src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
index 178a4aa6681..3e242a797a2 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
@@ -81,7 +81,7 @@ fn main() {
     match (true, None) {
         (true, Some(_)) => {}
         (false, Some(true)) => {}
-        (true | false, None | Some(true // FIXME: should be unreachable
+        (true | false, None | Some(true //~ ERROR unreachable
                                    | false)) => {}
     }
     macro_rules! t_or_f {
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
index 38e2369ae7d..ac0b34c2bd5 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
@@ -107,6 +107,12 @@ LL |         [true
    |          ^^^^
 
 error: unreachable pattern
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:84:36
+   |
+LL |         (true | false, None | Some(true
+   |                                    ^^^^
+
+error: unreachable pattern
   --> $DIR/exhaustiveness-unreachable-pattern.rs:100:14
    |
 LL |         Some(0
@@ -130,5 +136,5 @@ error: unreachable pattern
 LL |             | true,
    |               ^^^^
 
-error: aborting due to 21 previous errors
+error: aborting due to 22 previous errors