diff options
Diffstat (limited to 'src/test/stdtest')
| -rw-r--r-- | src/test/stdtest/run.rs | 5 | ||||
| -rw-r--r-- | src/test/stdtest/vec_str_conversions.rs | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/test/stdtest/run.rs b/src/test/stdtest/run.rs index 1be8cdf9b37..bc16e6ea2cf 100644 --- a/src/test/stdtest/run.rs +++ b/src/test/stdtest/run.rs @@ -4,6 +4,7 @@ import std::os; import std::io; import std::option; import std::str; +import std::ivec; // Regression test for memory leaks #[cfg(target_os = "linux")] @@ -58,8 +59,8 @@ fn test_pipes() { let reader = io::new_reader(io::FILE_buf_reader(file, option::none)); let buf = ""; while !reader.eof() { - let bytes = reader.read_bytes(4096u); - buf += str::unsafe_from_bytes(bytes); + let bytes = ivec::from_vec(reader.read_bytes(4096u)); + buf += str::unsafe_from_bytes_ivec(bytes); } os::libc::fclose(file); ret buf; diff --git a/src/test/stdtest/vec_str_conversions.rs b/src/test/stdtest/vec_str_conversions.rs index 62a0ce79d6d..3b103f80e5c 100644 --- a/src/test/stdtest/vec_str_conversions.rs +++ b/src/test/stdtest/vec_str_conversions.rs @@ -3,24 +3,17 @@ // -*- rust -*- use std; import std::str; -import std::vec; import std::ivec; #[test] fn test_simple() { let s1: str = "All mimsy were the borogoves"; - /* - * FIXME from_bytes(vec[u8] v) has constraint is_utf(v), which is - * unimplemented and thereby just fails. This doesn't stop us from - * using from_bytes for now since the constraint system isn't fully - * working, but we should implement is_utf8 before that happens. - */ - let v: vec[u8] = ivec::to_vec(str::bytes(s1)); - let s2: str = str::unsafe_from_bytes(v); + let v: [u8] = str::bytes(s1); + let s2: str = str::unsafe_from_bytes_ivec(v); let i: uint = 0u; let n1: uint = str::byte_len(s1); - let n2: uint = vec::len[u8](v); + let n2: uint = ivec::len[u8](v); assert (n1 == n2); while i < n1 { let a: u8 = s1.(i); |