Skip to content

Commit 88baca7

Browse files
committed
Rename vector patterns to array patterns
Closes #17765.
1 parent e434aa1 commit 88baca7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/librustc/middle/typeck/check/_match.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,30 +670,30 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
670670
(ty, default_region_var, ast::MutImmutable, None)
671671
}
672672
_ => {
673-
check_err("a vector pattern".to_string());
673+
check_err("an array pattern".to_string());
674674
return;
675675
}
676676
},
677677
ty::ty_rptr(r, mt) => match ty::get(mt.ty).sty {
678678
ty::ty_vec(ty, None) => (ty, r, mt.mutbl, None),
679679
_ => {
680-
check_err("a vector pattern".to_string());
680+
check_err("an array pattern".to_string());
681681
return;
682682
}
683683
},
684684
_ => {
685-
check_err("a vector pattern".to_string());
685+
check_err("an array pattern".to_string());
686686
return;
687687
}
688688
};
689689

690690
let min_len = before.len() + after.len();
691691
fixed.and_then(|count| match *slice {
692692
Some(_) if count < min_len =>
693-
Some(format!("a fixed vector pattern of size at least {}", min_len)),
693+
Some(format!("a fixed array pattern of size at least {}", min_len)),
694694

695695
None if count != min_len =>
696-
Some(format!("a fixed vector pattern of size {}", min_len)),
696+
Some(format!("a fixed array pattern of size {}", min_len)),
697697

698698
_ => None
699699
}).map(check_err);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
let x = [1,2];
1313
let y = match x {
1414
[] => None,
15-
//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed vector pattern of size 0
15+
//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed array pattern of size 0
1616
[a,_] => Some(a)
1717
};
1818
}

src/test/compile-fail/match-vec-mismatch-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
fn main() {
1212
match () {
13-
[()] => { } //~ ERROR mismatched types: expected `()`, found a vector pattern
13+
[()] => { } //~ ERROR mismatched types: expected `()`, found an array pattern
1414
}
1515
}

0 commit comments

Comments
 (0)