Rename str::split_ivec to str::split
This commit is contained in:
parent
e3e9811b7f
commit
1e397eee2a
@ -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, ".")
|
||||
|
@ -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, ".");
|
||||
}
|
||||
|
@ -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] {
|
||||
|
@ -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;
|
||||
|
@ -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, ".")
|
||||
};
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user