Rename std::ivec to std::vec

5 files changed, 24 insertions, 24 deletions

diff --git a/src/comp/metadata/creader.rs b/src/comp/metadata/creader.rs
index 38cf9e619f3..e00ddb11be6 100644
--- a/src/comp/metadata/creader.rs
+++ b/src/comp/metadata/creader.rs
@@ -12,7 +12,7 @@ import syntax::visit;
 import syntax::codemap::span;
 import back::x86;
 import util::common;
-import std::ivec;
+import std::vec;
 import std::str;
 import std::fs;
 import std::io;
@@ -94,7 +94,7 @@ fn metadata_matches(crate_data: &@[u8], metas: &[@ast::meta_item]) -> bool {
     let linkage_metas = attr::find_linkage_metas(attrs);
 
     log #fmt("matching %u metadata requirements against %u items",
-             ivec::len(metas), ivec::len(linkage_metas));
+             vec::len(metas), vec::len(linkage_metas));
 
     for needed: @ast::meta_item in metas {
         if !attr::contains(linkage_metas, needed) {
@@ -126,7 +126,7 @@ fn find_library_crate(sess: &session::session, ident: &ast::ident,
     // is using the wrong type of meta item
     let crate_name = {
         let name_items = attr::find_meta_items_by_name(metas, "name");
-        alt ivec::last(name_items) {
+        alt vec::last(name_items) {
           some(i) {
             alt attr::get_meta_item_value_str(i) {
               some(n) { n }
@@ -196,7 +196,7 @@ fn get_metadata_section(filename: str) -> option::t[@[u8]] {
             let cbuf = llvm::LLVMGetSectionContents(si.llsi);
             let csz = llvm::LLVMGetSectionSize(si.llsi);
             let cvbuf: *u8 = std::unsafe::reinterpret_cast(cbuf);
-            ret option::some[@[u8]](@ivec::unsafe::from_buf(cvbuf, csz));
+            ret option::some[@[u8]](@vec::unsafe::from_buf(cvbuf, csz));
         }
         llvm::LLVMMoveToNextSection(si.llsi);
     }
diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs
index 1ee1e2d072b..e93b674bc32 100644
--- a/src/comp/metadata/cstore.rs
+++ b/src/comp/metadata/cstore.rs
@@ -1,7 +1,7 @@
 // The crate store - a central repo for information collected about external
 // crates and libraries
 
-import std::ivec;
+import std::vec;
 import std::map;
 import std::str;
 import syntax::ast;
@@ -83,7 +83,7 @@ iter iter_crate_data(cstore: &cstore) ->
 }
 
 fn add_used_crate_file(cstore: &cstore, lib: &str) {
-    if !ivec::member(lib, p(cstore).used_crate_files) {
+    if !vec::member(lib, p(cstore).used_crate_files) {
         p(cstore).used_crate_files += ~[lib];
     }
 }
@@ -95,7 +95,7 @@ fn get_used_crate_files(cstore: &cstore) -> [str] {
 fn add_used_library(cstore: &cstore, lib: &str) -> bool {
     if lib == "" { ret false; }
 
-    if ivec::member(lib, p(cstore).used_libraries) { ret false; }
+    if vec::member(lib, p(cstore).used_libraries) { ret false; }
 
     p(cstore).used_libraries += ~[lib];
     ret true;
diff --git a/src/comp/metadata/decoder.rs b/src/comp/metadata/decoder.rs
index 2fadfaab7a7..d365d58fc60 100644
--- a/src/comp/metadata/decoder.rs
+++ b/src/comp/metadata/decoder.rs
@@ -1,7 +1,7 @@
 // Decoding metadata from a single crate's metadata
 
 import std::ebml;
-import std::ivec;
+import std::vec;
 import std::option;
 import std::str;
 import std::io;
@@ -48,7 +48,7 @@ fn lookup_hash(d: &ebml::doc, eq_fn: fn(&[u8]) -> bool , hash: uint) ->
     let belt = tag_index_buckets_bucket_elt;
     for each elt: ebml::doc in ebml::tagged_docs(bucket, belt) {
         let pos = ebml::be_uint_from_bytes(elt.data, elt.start, 4u);
-        if eq_fn(ivec::slice[u8](*elt.data, elt.start + 4u, elt.end)) {
+        if eq_fn(vec::slice[u8](*elt.data, elt.start + 4u, elt.end)) {
             result += ~[ebml::doc_at(d.data, pos)];
         }
     }
@@ -62,7 +62,7 @@ fn maybe_find_item(item_id: int, items: &ebml::doc) ->
     }
     let eqer = bind eq_item(_, item_id);
     let found = lookup_hash(items, eqer, hash_node_id(item_id));
-    if ivec::len(found) == 0u {
+    if vec::len(found) == 0u {
         ret option::none[ebml::doc];
     } else { ret option::some[ebml::doc](found.(0)); }
 }
@@ -166,7 +166,7 @@ fn resolve_path(path: &[ast::ident], data: @[u8]) -> [ast::def_id] {
 // Crate metadata queries
 fn lookup_defs(data: &@[u8], cnum: ast::crate_num, path: &[ast::ident]) ->
    [ast::def] {
-    ret ivec::map(bind lookup_def(cnum, data, _), resolve_path(path, data));
+    ret vec::map(bind lookup_def(cnum, data, _), resolve_path(path, data));
 }
 
 
@@ -213,7 +213,7 @@ fn get_type(data: @[u8], def: ast::def_id, tcx: &ty::ctxt,
 }
 
 fn get_type_param_count(data: @[u8], id: ast::node_id) -> uint {
-    ret ivec::len(get_type_param_kinds(data, id));
+    ret vec::len(get_type_param_kinds(data, id));
 }
 
 fn get_type_param_kinds(data: @[u8], id: ast::node_id) -> [ast::kind] {
@@ -269,7 +269,7 @@ fn family_has_type_params(fam_ch: u8) -> bool {
 fn read_path(d: &ebml::doc) -> {path: str, pos: uint} {
     let desc = ebml::doc_data(d);
     let pos = ebml::be_uint_from_bytes(@desc, 0u, 4u);
-    let pathbytes = ivec::slice[u8](desc, 4u, ivec::len[u8](desc));
+    let pathbytes = vec::slice[u8](desc, 4u, vec::len[u8](desc));
     let path = str::unsafe_from_bytes(pathbytes);
     ret {path: path, pos: pos};
 }
@@ -331,7 +331,7 @@ fn get_attributes(md: &ebml::doc) -> [ast::attribute] {
             let meta_items = get_meta_items(attr_doc);
             // Currently it's only possible to have a single meta item on
             // an attribute
-            assert (ivec::len(meta_items) == 1u);
+            assert (vec::len(meta_items) == 1u);
             let meta_item = meta_items.(0);
             attrs +=
                 ~[{node: {style: ast::attr_outer, value: *meta_item},
diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs
index 2976745327f..8cd1380784e 100644
--- a/src/comp/metadata/encoder.rs
+++ b/src/comp/metadata/encoder.rs
@@ -1,6 +1,6 @@
 // Metadata encoding
 
-import std::ivec;
+import std::vec;
 import std::str;
 import std::uint;
 import std::io;
@@ -176,7 +176,7 @@ fn def_to_str(did: &def_id) -> str { ret #fmt("%d:%d", did.crate, did.node); }
 
 fn encode_type_param_kinds(ebml_w: &ebml::writer, tps: &[ty_param]) {
     ebml::start_tag(ebml_w, tag_items_data_item_ty_param_kinds);
-    ebml::write_vint(ebml_w.writer, ivec::len[ty_param](tps));
+    ebml::write_vint(ebml_w.writer, vec::len[ty_param](tps));
     for tp: ty_param in tps {
         let c = alt tp.kind {
           kind_unique. { 'u' }
@@ -236,7 +236,7 @@ fn encode_tag_variant_info(ecx: &@encode_ctxt, ebml_w: &ebml::writer,
         encode_tag_id(ebml_w, local_def(id));
         encode_type(ecx, ebml_w,
                     node_id_to_monotype(ecx.ccx.tcx, variant.node.id));
-        if ivec::len[variant_arg](variant.node.args) > 0u {
+        if vec::len[variant_arg](variant.node.args) > 0u {
             encode_symbol(ecx, ebml_w, variant.node.id);
         }
         encode_discriminant(ecx, ebml_w, variant.node.id);
@@ -563,9 +563,9 @@ fn encode_crate_deps(ebml_w: &ebml::writer, cstore: &cstore::cstore) {
 
         // Return just the names
         fn name(kv: &numname) -> str { kv.ident }
-        // mutable -> immutable hack for ivec::map
-        let immpairs = ivec::slice(pairs, 0u, ivec::len(pairs));
-        ret ivec::map(name, immpairs);
+        // mutable -> immutable hack for vec::map
+        let immpairs = vec::slice(pairs, 0u, vec::len(pairs));
+        ret vec::map(name, immpairs);
     }
 
     // We're just going to write a list of crate names, with the assumption
diff --git a/src/comp/metadata/tydecode.rs b/src/comp/metadata/tydecode.rs
index d72d7b2c869..402855e34da 100644
--- a/src/comp/metadata/tydecode.rs
+++ b/src/comp/metadata/tydecode.rs
@@ -1,6 +1,6 @@
 // Type decoding
 
-import std::ivec;
+import std::vec;
 import std::str;
 import std::uint;
 import std::option;
@@ -409,14 +409,14 @@ fn parse_ty_fn(st: @pstate, sd: str_def) ->
 // Rust metadata parsing
 fn parse_def_id(buf: &[u8]) -> ast::def_id {
     let colon_idx = 0u;
-    let len = ivec::len[u8](buf);
+    let len = vec::len[u8](buf);
     while colon_idx < len && buf.(colon_idx) != ':' as u8 { colon_idx += 1u; }
     if colon_idx == len {
         log_err "didn't find ':' when parsing def id";
         fail;
     }
-    let crate_part = ivec::slice[u8](buf, 0u, colon_idx);
-    let def_part = ivec::slice[u8](buf, colon_idx + 1u, len);
+    let crate_part = vec::slice[u8](buf, 0u, colon_idx);
+    let def_part = vec::slice[u8](buf, colon_idx + 1u, len);
 
     let crate_part_vec = ~[];
     let def_part_vec = ~[];