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/test | |
| parent | cfb9cba19f145b94f181591d1d7428504e185818 (diff) | |
| download | rust-64f53dfbb070e0b2a0c77042b23db15b0ec64e48.tar.gz rust-64f53dfbb070e0b2a0c77042b23db15b0ec64e48.zip | |
Convert uses of str::split to split_ivec
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compiletest/runtest.rs | 8 | ||||
| -rw-r--r-- | src/test/stdtest/str.rs | 2 |
2 files changed, 5 insertions, 5 deletions
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; |
