about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorNadrieril <nadrieril+git@gmail.com>2019-11-29 15:53:54 +0000
committerNadrieril <nadrieril+git@gmail.com>2019-12-02 16:03:03 +0000
commit1c1bec2f6dbed0910b2e0ca19cffb92d95be4ee5 (patch)
tree89720a41cd7a0c26fe58a5428f93b31388f10281 /src/test
parentef087d96f0fd44ce83ac8c44d11bbe3faa8e1c6a (diff)
downloadrust-1c1bec2f6dbed0910b2e0ca19cffb92d95be4ee5.tar.gz
rust-1c1bec2f6dbed0910b2e0ca19cffb92d95be4ee5.zip
Remove top-level or-pattern hack
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/pattern/usefulness/top-level-alternation.rs3
-rw-r--r--src/test/ui/pattern/usefulness/top-level-alternation.stderr14
2 files changed, 5 insertions, 12 deletions
diff --git a/src/test/ui/pattern/usefulness/top-level-alternation.rs b/src/test/ui/pattern/usefulness/top-level-alternation.rs
index 5a7f82063b8..4b47b978930 100644
--- a/src/test/ui/pattern/usefulness/top-level-alternation.rs
+++ b/src/test/ui/pattern/usefulness/top-level-alternation.rs
@@ -46,8 +46,7 @@ fn main() {
     match Some(0u8) {
         Some(_) => {}
         None => {}
-        None //~ ERROR unreachable pattern
-            | Some(_) => {} //~ ERROR unreachable pattern
+        None | Some(_) => {} //~ ERROR unreachable pattern
     }
     match 0u8 {
         1 | 2 => {},
diff --git a/src/test/ui/pattern/usefulness/top-level-alternation.stderr b/src/test/ui/pattern/usefulness/top-level-alternation.stderr
index 772927f42f5..7c7c4fc4eba 100644
--- a/src/test/ui/pattern/usefulness/top-level-alternation.stderr
+++ b/src/test/ui/pattern/usefulness/top-level-alternation.stderr
@@ -55,20 +55,14 @@ LL |         None => {}
 error: unreachable pattern
   --> $DIR/top-level-alternation.rs:49:9
    |
-LL |         None
-   |         ^^^^
-
-error: unreachable pattern
-  --> $DIR/top-level-alternation.rs:50:15
-   |
-LL |             | Some(_) => {}
-   |               ^^^^^^^
+LL |         None | Some(_) => {}
+   |         ^^^^^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/top-level-alternation.rs:54:9
+  --> $DIR/top-level-alternation.rs:53:9
    |
 LL |         1..=2 => {},
    |         ^^^^^
 
-error: aborting due to 11 previous errors
+error: aborting due to 10 previous errors