Rename vector patterns to array patterns

Closes #17765.
This commit is contained in:
P1start 2014-10-05 12:08:37 +13:00
parent e434aa1cf7
commit 88baca7486
3 changed files with 7 additions and 7 deletions

View file

@ -670,19 +670,19 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
(ty, default_region_var, ast::MutImmutable, None)
}
_ => {
check_err("a vector pattern".to_string());
check_err("an array pattern".to_string());
return;
}
},
ty::ty_rptr(r, mt) => match ty::get(mt.ty).sty {
ty::ty_vec(ty, None) => (ty, r, mt.mutbl, None),
_ => {
check_err("a vector pattern".to_string());
check_err("an array pattern".to_string());
return;
}
},
_ => {
check_err("a vector pattern".to_string());
check_err("an array pattern".to_string());
return;
}
};
@ -690,10 +690,10 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
let min_len = before.len() + after.len();
fixed.and_then(|count| match *slice {
Some(_) if count < min_len =>
Some(format!("a fixed vector pattern of size at least {}", min_len)),
Some(format!("a fixed array pattern of size at least {}", min_len)),
None if count != min_len =>
Some(format!("a fixed vector pattern of size {}", min_len)),
Some(format!("a fixed array pattern of size {}", min_len)),
_ => None
}).map(check_err);

View file

@ -12,7 +12,7 @@ fn main() {
let x = [1,2];
let y = match x {
[] => None,
//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed vector pattern of size 0
//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed array pattern of size 0
[a,_] => Some(a)
};
}

View file

@ -10,6 +10,6 @@
fn main() {
match () {
[()] => { } //~ ERROR mismatched types: expected `()`, found a vector pattern
[()] => { } //~ ERROR mismatched types: expected `()`, found an array pattern
}
}