user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert uses of str::split to split_ivec

Browse source
This commit is contained in:
Brian Anderson 2011-08-11 17:29:22 -07:00
parent cfb9cba19f
commit 64f53dfbb0
5 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/comp/back/link.rs
View file

@ -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, ".")

6
src/comp/driver/rustc.rs
View file

@ -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)) }

7
src/comp/metadata/cstore.rs
View file

@ -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] {

8
src/test/compiletest/runtest.rs
View file

@ -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)
}

2
src/test/stdtest/str.rs
View file

@ -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;