From 26a0afbd9f632a8af4e98bc8eeab52b8386aadc2 Mon Sep 17 00:00:00 2001 From: Ariel Ben-Yehuda Date: Fri, 4 Mar 2016 16:10:22 +0200 Subject: [PATCH] remove wrong assert in check_match the assert was invalidated by PR #31020 Fixes #31561 --- src/librustc/middle/check_match.rs | 5 +---- src/test/compile-fail/issue-31561.rs | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/test/compile-fail/issue-31561.rs diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index be8793bac5dbf..15da452771fee 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -1047,10 +1047,7 @@ fn is_refutable(cx: &MatchCheckCtxt, pat: &Pat, refutable: F) -> Option { 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 0000000000000..f8645c4d3a7e8 --- /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 or the MIT license +// , 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 +}