diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 0acc9216fc02..9672c2dc7fdf 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -357,7 +357,7 @@ fn build_link_meta(sess: &session::session, c: &ast::crate, output: &str, let name = { let os = - str::split_ivec(fs::basename(output), '.' as u8); + str::split(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 8d28b9f47b56..4d662f3cf334 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -520,7 +520,7 @@ fn main(args: vec[str]) { // "-" as input file will cause the parser to read from stdin so we // have to make up a name let parts = if !input_is_stdin(ifile) { - str::split_ivec(ifile, '.' as u8) + str::split(ifile, '.' as u8) } else { ~["default", "rs"] }; @@ -586,7 +586,7 @@ fn main(args: vec[str]) { } else { ret filename; } }(config, _); fn rmext(filename: str) -> str { - let parts = str::split_ivec(filename, '.' as u8); + let parts = str::split(filename, '.' as u8); ivec::pop(parts); ret str::connect_ivec(parts, "."); } diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs index 9af6a98da893..1ee1e2d072b3 100644 --- a/src/comp/metadata/cstore.rs +++ b/src/comp/metadata/cstore.rs @@ -106,7 +106,7 @@ fn get_used_libraries(cstore: &cstore) -> [str] { } fn add_used_link_args(cstore: &cstore, args: &str) { - p(cstore).used_link_args += str::split_ivec(args, ' ' as u8); + p(cstore).used_link_args += str::split(args, ' ' as u8); } fn get_used_link_args(cstore: &cstore) -> [str] { diff --git a/src/lib/str.rs b/src/lib/str.rs index db6180ce02fe..eddc6723a136 100644 --- a/src/lib/str.rs +++ b/src/lib/str.rs @@ -41,7 +41,7 @@ export shift_byte; export pop_byte; export push_byte; export unshift_byte; -export split_ivec; +export split; export concat; export connect; export connect_ivec; @@ -434,7 +434,7 @@ fn unshift_byte(s: &mutable str, b: u8) { s = rs; } -fn split_ivec(s: str, sep: u8) -> [str] { +fn split(s: str, sep: u8) -> [str] { let v: [str] = ~[]; let accum: str = ""; let ends_with_sep: bool = false; diff --git a/src/test/compiletest/runtest.rs b/src/test/compiletest/runtest.rs index d51939650c0f..af879bd677f0 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_ivec(procres.stdout, '\n' as u8) { + for line: str in str::split(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; @@ -293,7 +293,7 @@ fn split_maybe_args(argstr: &option::t[str]) -> [str] { } alt argstr { - option::some(s) { rm_whitespace(str::split_ivec(s, ' ' as u8)) } + option::some(s) { rm_whitespace(str::split(s, ' ' as u8)) } option::none. { ~[] } } } @@ -355,7 +355,7 @@ fn output_base_name(config: &config, testfile: &str) -> str { let base = config.build_base; let filename = { - let parts = str::split_ivec(fs::basename(testfile), '.' as u8); + let parts = str::split(fs::basename(testfile), '.' as u8); parts = ivec::slice(parts, 0u, ivec::len(parts) - 1u); str::connect_ivec(parts, ".") }; diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs index d1d2e9e687b9..0a27f3b4311e 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_ivec(s, c as u8); + let v = str::split(s, c as u8); log "split to: "; for z: str in v { log z; } log "comparing: " + v.(i) + " vs. " + k;