From 88baca7486607bb9799ab338afdf088b4cf9e2bd Mon Sep 17 00:00:00 2001
From: P1start <rewi-github@whanau.org>
Date: Sun, 5 Oct 2014 12:08:37 +1300
Subject: [PATCH] Rename vector patterns to array patterns

Closes #17765.
---
 src/librustc/middle/typeck/check/_match.rs    | 10 +++++-----
 src/test/compile-fail/issue-13482.rs          |  2 +-
 src/test/compile-fail/match-vec-mismatch-2.rs |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/librustc/middle/typeck/check/_match.rs b/src/librustc/middle/typeck/check/_match.rs
index 17cfa040804e..b5af2b26b295 100644
--- a/src/librustc/middle/typeck/check/_match.rs
+++ b/src/librustc/middle/typeck/check/_match.rs
@@ -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);
diff --git a/src/test/compile-fail/issue-13482.rs b/src/test/compile-fail/issue-13482.rs
index e5d87395286e..2c7b56f9dc7f 100644
--- a/src/test/compile-fail/issue-13482.rs
+++ b/src/test/compile-fail/issue-13482.rs
@@ -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)
   };
 }
diff --git a/src/test/compile-fail/match-vec-mismatch-2.rs b/src/test/compile-fail/match-vec-mismatch-2.rs
index fee49ad8fdb0..e095c7c24085 100644
--- a/src/test/compile-fail/match-vec-mismatch-2.rs
+++ b/src/test/compile-fail/match-vec-mismatch-2.rs
@@ -10,6 +10,6 @@
 
 fn main() {
     match () {
-        [()] => { } //~ ERROR mismatched types: expected `()`, found a vector pattern
+        [()] => { } //~ ERROR mismatched types: expected `()`, found an array pattern
     }
 }