Convert uses of str::split to split_ivec

5 files changed, 11 insertions, 19 deletions

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index 7e7444e4a64..0acc9216fc0 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -354,13 +354,10 @@ fn build_link_meta(sess: &session::session, c: &ast::crate, output: &str,
         ret alt metas.name {
               some(v) { v }
               none. {
-                // FIXME: Remove this vec->ivec conversion.
                 let name =
                     {
-                        let os_vec =
-                            str::split(fs::basename(output), '.' as u8);
-                        let os = ~[];
-                        for s: str  in os_vec { os += ~[s]; }
+                        let os =
+                            str::split_ivec(fs::basename(output), '.' as u8);
                         assert (ivec::len(os) >= 2u);
                         ivec::pop(os);
                         str::connect_ivec(os, ".")
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 03c93cbb208..8d28b9f47b5 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -586,9 +586,9 @@ fn main(args: vec[str]) {
                      } else { ret filename; }
                  }(config, _);
         fn rmext(filename: str) -> str {
-            let parts = str::split(filename, '.' as u8);
-            vec::pop(parts);
-            ret str::connect(parts, ".");
+            let parts = str::split_ivec(filename, '.' as u8);
+            ivec::pop(parts);
+            ret str::connect_ivec(parts, ".");
         }
         ret alt config.os {
               session::os_macos. { rmext(rmlib(filename)) }
diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs
index bebd695fda1..9af6a98da89 100644
--- a/src/comp/metadata/cstore.rs
+++ b/src/comp/metadata/cstore.rs
@@ -106,12 +106,7 @@ fn get_used_libraries(cstore: &cstore) -> [str] {
 }
 
 fn add_used_link_args(cstore: &cstore, args: &str) {
-    let used_link_args_vec = str::split(args, ' ' as u8);
-
-    // TODO: Remove this vec->ivec conversion.
-    for ula: str  in used_link_args_vec {
-        p(cstore).used_link_args += ~[ula];
-    }
+    p(cstore).used_link_args += str::split_ivec(args, ' ' as u8);
 }
 
 fn get_used_link_args(cstore: &cstore) -> [str] {
diff --git a/src/test/compiletest/runtest.rs b/src/test/compiletest/runtest.rs
index 764150e5961..d51939650c0 100644
--- a/src/test/compiletest/runtest.rs
+++ b/src/test/compiletest/runtest.rs
@@ -193,7 +193,7 @@ fn check_error_patterns(props: &test_props, testfile: &str,
 
     let next_err_idx = 0u;
     let next_err_pat = props.error_patterns.(next_err_idx);
-    for line: str  in str::split(procres.stdout, '\n' as u8) {
+    for line: str  in str::split_ivec(procres.stdout, '\n' as u8) {
         if str::find(line, next_err_pat) > 0 {
             log #fmt("found error pattern %s", next_err_pat);
             next_err_idx += 1u;
@@ -355,9 +355,9 @@ fn output_base_name(config: &config, testfile: &str) -> str {
     let base = config.build_base;
     let filename =
         {
-            let parts = str::split(fs::basename(testfile), '.' as u8);
-            parts = vec::slice(parts, 0u, vec::len(parts) - 1u);
-            str::connect(parts, ".")
+            let parts = str::split_ivec(fs::basename(testfile), '.' as u8);
+            parts = ivec::slice(parts, 0u, ivec::len(parts) - 1u);
+            str::connect_ivec(parts, ".")
         };
     #fmt("%s%s.%s", base, filename, config.stage_id)
 }
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index 0a27f3b4311..d1d2e9e687b 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -27,7 +27,7 @@ fn test_split() {
     fn t(s: &str, c: char, i: int, k: &str) {
         log "splitting: " + s;
         log i;
-        let v = str::split(s, c as u8);
+        let v = str::split_ivec(s, c as u8);
         log "split to: ";
         for z: str  in v { log z; }
         log "comparing: " + v.(i) + " vs. " + k;