about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <ariel.byd@gmail.com>2016-03-04 16:10:22 +0200
committerAriel Ben-Yehuda <ariel.byd@gmail.com>2016-03-04 16:11:38 +0200
commit26a0afbd9f632a8af4e98bc8eeab52b8386aadc2 (patch)
treede69c22cd6ea7ae052fc8a237ff1d2e543465ce3
parent5b5e52186917502258a9feadc8bf77a89183386b (diff)
downloadrust-26a0afbd9f632a8af4e98bc8eeab52b8386aadc2.tar.gz
rust-26a0afbd9f632a8af4e98bc8eeab52b8386aadc2.zip
remove wrong assert in check_match
the assert was invalidated by PR #31020

Fixes #31561
-rw-r--r--src/librustc/middle/check_match.rs5
-rw-r--r--src/test/compile-fail/issue-31561.rs20
2 files changed, 21 insertions, 4 deletions
diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs
index be8793bac5d..15da452771f 100644
--- a/src/librustc/middle/check_match.rs
+++ b/src/librustc/middle/check_match.rs
@@ -1047,10 +1047,7 @@ fn is_refutable<A, F>(cx: &MatchCheckCtxt, pat: &Pat, refutable: F) -> Option<A>
 {
     let pats = Matrix(vec!(vec!(pat)));
     match is_useful(cx, &pats, &[DUMMY_WILD_PAT], ConstructWitness) {
-        UsefulWithWitness(pats) => {
-            assert_eq!(pats.len(), 1);
-            Some(refutable(&pats[0]))
-        },
+        UsefulWithWitness(pats) => Some(refutable(&pats[0])),
         NotUseful => None,
         Useful => unreachable!()
     }
diff --git a/src/test/compile-fail/issue-31561.rs b/src/test/compile-fail/issue-31561.rs
new file mode 100644
index 00000000000..f8645c4d3a7
--- /dev/null
+++ b/src/test/compile-fail/issue-31561.rs
@@ -0,0 +1,20 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+enum Thing {
+    Foo(u8),
+    Bar,
+    Baz
+}
+
+fn main() {
+    let Thing::Foo(y) = Thing::Foo(1);
+    //~^ ERROR refutable pattern in local binding: `Bar` not covered
+}