Skip to content

Commit f40e2fd

Browse files
committed
---
yaml --- r: 114381 b: refs/heads/master c: 0089215 h: refs/heads/master i: 114379: aa06bff v: v3
1 parent 70263c7 commit f40e2fd

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 40d3241a4a929dc095dd94862e25e5684ef1083d
2+
refs/heads/master: 0089215472db188f7d102fa3fa3e086880d2ee4f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/librustc/middle/check_match.rs

Lines changed: 4 additions & 2 deletions
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,
Lines changed: 19 additions & 0 deletions
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)