Skip to content

Commit 80922a7

Browse files
committed
Auto merge of #32041 - arielb1:multiply-inexhaustive, r=eddyb
the assert was invalidated by PR #31020 Fixes #31561 r? @eddyb
2 parents c116ae3 + 26a0afb commit 80922a7

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

src/librustc/middle/check_match.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1047,10 +1047,7 @@ fn is_refutable<A, F>(cx: &MatchCheckCtxt, pat: &Pat, refutable: F) -> Option<A>
10471047
{
10481048
let pats = Matrix(vec!(vec!(pat)));
10491049
match is_useful(cx, &pats, &[DUMMY_WILD_PAT], ConstructWitness) {
1050-
UsefulWithWitness(pats) => {
1051-
assert_eq!(pats.len(), 1);
1052-
Some(refutable(&pats[0]))
1053-
},
1050+
UsefulWithWitness(pats) => Some(refutable(&pats[0])),
10541051
NotUseful => None,
10551052
Useful => unreachable!()
10561053
}

src/test/compile-fail/issue-31561.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
enum Thing {
12+
Foo(u8),
13+
Bar,
14+
Baz
15+
}
16+
17+
fn main() {
18+
let Thing::Foo(y) = Thing::Foo(1);
19+
//~^ ERROR refutable pattern in local binding: `Bar` not covered
20+
}

0 commit comments

Comments
 (0)