bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #36205 - EugeneGonzalez:E0528, r=jonathandturner

Browse source 
Fixed E0528 label and unit test

Fixes #36194 part of #35233.

r? @jonathandturner
This commit is contained in:
Jonathan Turner 2016-09-02 15:28:52 -07:00 • committed by GitHub
commit 6736bad424
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_typeck/check/_match.rs
View file

@ -248,9 +248,12 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} else if let Some(rest) = size.checked_sub(min_len) { } else if let Some(rest) = size.checked_sub(min_len) {
(inner_ty, tcx.mk_array(inner_ty, rest)) (inner_ty, tcx.mk_array(inner_ty, rest))
} else { } else {
span_err!(tcx.sess, pat.span, E0528, struct_span_err!(tcx.sess, pat.span, E0528,
"pattern requires at least {} elements but array has {}", "pattern requires at least {} elements but array has {}",
min_len, size); min_len, size)
.span_label(pat.span,
&format!("pattern cannot match array of {} elements", size))
.emit();
(inner_ty, tcx.types.err) (inner_ty, tcx.types.err)
} }
} }

4
src/test/compile-fail/E0528.rs
View file

@ -13,7 +13,9 @@
fn main() { fn main() {
let r = &[1, 2]; let r = &[1, 2];
match r { match r {
&[a, b, c, rest..] => { //~ ERROR E0528 &[a, b, c, rest..] => {
//~^ ERROR E0528
//~| NOTE pattern cannot match array of 2 elements
} }
} }
} }