Skip to content

Commit 0089215

Browse files
committed
rustc: Avoid an unwrap() in check_match
Closes #12369
1 parent 40d3241 commit 0089215

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

src/librustc/middle/check_match.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,10 @@ fn is_useful_specialized(cx: &MatchCheckCtxt,
342342
let ms = m.iter().filter_map(|r| {
343343
specialize(cx, r.as_slice(), &ctor, arity, lty)
344344
}).collect::<matrix>();
345-
let could_be_useful = is_useful(
346-
cx, &ms, specialize(cx, v, &ctor, arity, lty).unwrap().as_slice());
345+
let could_be_useful = match specialize(cx, v, &ctor, arity, lty) {
346+
Some(v) => is_useful(cx, &ms, v.as_slice()),
347+
None => return not_useful,
348+
};
347349
match could_be_useful {
348350
useful_ => useful(lty, ctor),
349351
u => u,

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

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2014 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+
fn main() {
12+
let sl = vec![1,2,3];
13+
let v: int = match sl.as_slice() {
14+
[] => 0,
15+
[a,b,c] => 3,
16+
[a, ..rest] => a,
17+
[10,a, ..rest] => 10 //~ ERROR: unreachable pattern
18+
};
19+
}

0 commit comments

Comments
 (0)