diff options
| author | Nadrieril <nadrieril+git@gmail.com> | 2020-12-17 01:25:53 +0000 |
|---|---|---|
| committer | Nadrieril <nadrieril+git@gmail.com> | 2020-12-18 16:21:39 +0000 |
| commit | 6319d737e07d732aa044864933b69a39fdbeec0a (patch) | |
| tree | ee12811deeaa0991550d3e786c31db501cbdffb5 /src/test | |
| parent | 2d71a0b9b9871966dd1f63b4113eeecc2d6e2f6f (diff) | |
Merge unreachable subpatterns correctly
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr | 20 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs index 3e242a797a2..184ffa85c40 100644 --- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs +++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs @@ -64,11 +64,9 @@ fn main() { | 2, ..] => {} _ => {} } - // FIXME: incorrect match &[][..] { [true] => {} - [true //~ ERROR unreachable - | false, ..] => {} + [true | false, ..] => {} _ => {} } match &[][..] { diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr index ac0b34c2bd5..8b1003b5514 100644 --- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr +++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr @@ -95,46 +95,40 @@ LL | [1 | ^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:70:10 + --> $DIR/exhaustiveness-unreachable-pattern.rs:75:10 | LL | [true | ^^^^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:77:10 - | -LL | [true - | ^^^^ - -error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:84:36 + --> $DIR/exhaustiveness-unreachable-pattern.rs:82:36 | LL | (true | false, None | Some(true | ^^^^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:100:14 + --> $DIR/exhaustiveness-unreachable-pattern.rs:98:14 | LL | Some(0 | ^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:119:19 + --> $DIR/exhaustiveness-unreachable-pattern.rs:117:19 | LL | | false) => {} | ^^^^^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:127:15 + --> $DIR/exhaustiveness-unreachable-pattern.rs:125:15 | LL | | true) => {} | ^^^^ error: unreachable pattern - --> $DIR/exhaustiveness-unreachable-pattern.rs:133:15 + --> $DIR/exhaustiveness-unreachable-pattern.rs:131:15 | LL | | true, | ^^^^ -error: aborting due to 22 previous errors +error: aborting due to 21 previous errors |