Skip to content

Commit

Permalink
rustc: Avoid an unwrap() in check_match
Browse files Browse the repository at this point in the history
Closes #12369
  • Loading branch information
alexcrichton committed May 21, 2014
1 parent 40d3241 commit 0089215
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/librustc/middle/check_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,10 @@ fn is_useful_specialized(cx: &MatchCheckCtxt,
let ms = m.iter().filter_map(|r| {
specialize(cx, r.as_slice(), &ctor, arity, lty)
}).collect::<matrix>();
let could_be_useful = is_useful(
cx, &ms, specialize(cx, v, &ctor, arity, lty).unwrap().as_slice());
let could_be_useful = match specialize(cx, v, &ctor, arity, lty) {
Some(v) => is_useful(cx, &ms, v.as_slice()),
None => return not_useful,
};
match could_be_useful {
useful_ => useful(lty, ctor),
u => u,
Expand Down
19 changes: 19 additions & 0 deletions src/test/compile-fail/issue-12369.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2014 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.

fn main() {
let sl = vec![1,2,3];
let v: int = match sl.as_slice() {
[] => 0,
[a,b,c] => 3,
[a, ..rest] => a,
[10,a, ..rest] => 10 //~ ERROR: unreachable pattern
};
}

0 comments on commit 0089215

Please sign in to comment.