diff options
| author | Nadrieril <nadrieril+git@gmail.com> | 2020-10-20 22:08:19 +0100 |
|---|---|---|
| committer | Nadrieril <nadrieril+git@gmail.com> | 2020-11-05 22:02:35 +0000 |
| commit | 25e272e3886ecdc91f3e42436cedbe5a6fc6ff29 (patch) | |
| tree | c7d0dcb47ab1214bd89fc64063ac339233d1e417 /src | |
| parent | 03f0ca0cf4bf427516f9d87a959b7c97c9ff9447 (diff) | |
| download | rust-25e272e3886ecdc91f3e42436cedbe5a6fc6ff29.tar.gz rust-25e272e3886ecdc91f3e42436cedbe5a6fc6ff29.zip | |
Fix unreachable sub-branch detection
This fixes https://github.com/rust-lang/rust/issues/76836
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr | 16 |
2 files changed, 12 insertions, 6 deletions
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 @@ -101,6 +101,12 @@ 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 | LL | | true) => {} @@ -112,5 +118,5 @@ error: unreachable pattern LL | | true, | ^^^^ -error: aborting due to 18 previous errors +error: aborting due to 19 previous errors |