From 25e272e3886ecdc91f3e42436cedbe5a6fc6ff29 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Tue, 20 Oct 2020 22:08:19 +0100
Subject: Fix unreachable sub-branch detection

This fixes https://github.com/rust-lang/rust/issues/76836
---
 .../ui/or-patterns/exhaustiveness-unreachable-pattern.rs |  2 +-
 .../exhaustiveness-unreachable-pattern.stderr            | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
index 97a8f526176..512f1e283cb 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
@@ -85,7 +85,7 @@ fn main() {
     match None {
         Some(false) => {}
         None | Some(true
-                | false) => {} // expected unreachable warning here
+                | false) => {} //~ ERROR unreachable
     }
 
     // A subpattern that is unreachable in all branches is overall unreachable.
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
index e83cd247a57..3956a42c536 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
@@ -77,15 +77,15 @@ LL |         (1 | 1,) => {}
    |              ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:53:15
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:55:15
    |
-LL |             | 0
+LL |             | 0] => {}
    |               ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:55:15
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:53:15
    |
-LL |             | 0] => {}
+LL |             | 0
    |               ^
 
 error: unreachable pattern
@@ -100,6 +100,12 @@ error: unreachable pattern
 LL |         Some(0
    |              ^
 
+error: unreachable pattern
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:88:19
+   |
+LL |                 | false) => {}
+   |                   ^^^^^
+
 error: unreachable pattern
   --> $DIR/exhaustiveness-unreachable-pattern.rs:96:15
    |
@@ -112,5 +118,5 @@ error: unreachable pattern
 LL |             | true,
    |               ^^^^
 
-error: aborting due to 18 previous errors
+error: aborting due to 19 previous errors
 
-- 
cgit 1.4.1-3-g733a5