diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-11 17:29:22 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-12 12:08:27 -0700 |
| commit | 64f53dfbb070e0b2a0c77042b23db15b0ec64e48 (patch) | |
| tree | c71b2579a822def40f4823a0d08bde5447662efd /src/comp | |
| parent | cfb9cba19f145b94f181591d1d7428504e185818 (diff) | |
| download | rust-64f53dfbb070e0b2a0c77042b23db15b0ec64e48.tar.gz rust-64f53dfbb070e0b2a0c77042b23db15b0ec64e48.zip | |
Convert uses of str::split to split_ivec
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/back/link.rs | 7 | ||||
| -rw-r--r-- | src/comp/driver/rustc.rs | 6 | ||||
| -rw-r--r-- | src/comp/metadata/cstore.rs | 7 |
3 files changed, 6 insertions, 14 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] { |