From f5ce3bf15d5f636bb73b7aae671b3a9e9681f38e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 18 Aug 2011 15:00:12 -0700
Subject: [PATCH] More misc ivec->vec renaming

---
 src/comp/middle/ty.rs                         | 4 ++--
 src/comp/syntax/ext/simplext.rs               | 2 +-
 src/comp/syntax/untyped_ast.rs                | 4 ++--
 src/test/compile-fail/bad-module.rs           | 4 ++--
 src/test/pretty/{ivec-type.pp => vec-type.pp} | 2 +-
 src/test/pretty/{ivec-type.rs => vec-type.rs} | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/test/pretty/{ivec-type.pp => vec-type.pp} (66%)
 rename src/test/pretty/{ivec-type.rs => vec-type.rs} (66%)

diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index 8352d5f9e28a..cf46e8b2a0fb 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -1348,7 +1348,7 @@ fn type_param(cx: &ctxt, ty: &t) -> option::t<uint> {
     ret none;
 }
 
-// Returns an ivec of all the type variables
+// Returns a vec of all the type variables
 // occurring in t. It may contain duplicates.
 fn vars_in_type(cx:&ctxt, ty: &t) -> [int] {
     fn collect_var(cx:&ctxt, vars: &@mutable [int], ty: t) {
@@ -1362,7 +1362,7 @@ fn vars_in_type(cx:&ctxt, ty: &t) -> [int] {
     let rslt: @mutable [int] = @mutable (~[]);
     walk_ty(cx, bind collect_var(cx, rslt, _), ty);
     // Works because of a "convenient" bug that lets us
-    // return a mutable ivec as if it's immutable
+    // return a mutable vec as if it's immutable
     ret *rslt;
 }
 
diff --git a/src/comp/syntax/ext/simplext.rs b/src/comp/syntax/ext/simplext.rs
index 6386b628744f..9b8a5e28e095 100644
--- a/src/comp/syntax/ext/simplext.rs
+++ b/src/comp/syntax/ext/simplext.rs
@@ -39,7 +39,7 @@ fn path_to_ident(pth: &path) -> option::t<ident> {
     ret none;
 }
 
-//an ivec of binders might be a little big.
+//a vec of binders might be a little big.
 type clause = {params: binders, body: @expr};
 
 /* logically, an arb_depth should contain only one kind of matchable */
diff --git a/src/comp/syntax/untyped_ast.rs b/src/comp/syntax/untyped_ast.rs
index 5534fbed57d7..124a1e947f11 100644
--- a/src/comp/syntax/untyped_ast.rs
+++ b/src/comp/syntax/untyped_ast.rs
@@ -1,4 +1,4 @@
-import std::ivec;
+import std::vec;
 import std::vec::map;
 import std::option;
 import std::option::some;
@@ -410,7 +410,7 @@ fn cv_crate(ctx: &ctx, ut: &@ast_node) -> @crate {
 fn cv_crate_cfg(ctx: &ctx, ut: &@ast_node) -> crate_cfg {
     ret alt *ut {
       branch(n_crate_cfg., _, meta_items) {
-        ivec::map(bind cv_meta_item(ctx,_), meta_items)
+        vec::map(bind cv_meta_item(ctx,_), meta_items)
       }
       branch(_, sp, _) { ctx.ff(sp,"Invalid crate_cfg") }
     };
diff --git a/src/test/compile-fail/bad-module.rs b/src/test/compile-fail/bad-module.rs
index 708db61bda43..bfb796916a39 100644
--- a/src/test/compile-fail/bad-module.rs
+++ b/src/test/compile-fail/bad-module.rs
@@ -1,4 +1,4 @@
-// error-pattern: unresolved import: ivec
-import ivec;
+// error-pattern: unresolved import: vec
+import vec;
 
 fn main() { let foo = vec::len([]); }
\ No newline at end of file
diff --git a/src/test/pretty/ivec-type.pp b/src/test/pretty/vec-type.pp
similarity index 66%
rename from src/test/pretty/ivec-type.pp
rename to src/test/pretty/vec-type.pp
index e9c714af0884..60265eebcf7f 100644
--- a/src/test/pretty/ivec-type.pp
+++ b/src/test/pretty/vec-type.pp
@@ -1,4 +1,4 @@
-// pp-exact:ivec-type.pp
+// pp-exact:vec-type.pp
 
 fn f1(x: [int]) { }
 
diff --git a/src/test/pretty/ivec-type.rs b/src/test/pretty/vec-type.rs
similarity index 66%
rename from src/test/pretty/ivec-type.rs
rename to src/test/pretty/vec-type.rs
index 717b50be9e3d..010ad755f513 100644
--- a/src/test/pretty/ivec-type.rs
+++ b/src/test/pretty/vec-type.rs
@@ -1,4 +1,4 @@
-// pp-exact:ivec-type.pp
+// pp-exact:vec-type.pp
 
 fn f1(x: [int]) { }