diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-31 14:59:45 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-31 16:24:08 -0700 |
| commit | 81b31429e48ec6ea8fd91679246d847ecf0fc762 (patch) | |
| tree | a0e167d32d7baaa41b5533c5c4654fa27895bf06 /src/lib/run_program.rs | |
| parent | 1772ee3c43656729f096d8902d7cf6f4d9cacc8d (diff) | |
| download | rust-81b31429e48ec6ea8fd91679246d847ecf0fc762.tar.gz rust-81b31429e48ec6ea8fd91679246d847ecf0fc762.zip | |
Remove more uses of str from std::run. Issue #855
Diffstat (limited to 'src/lib/run_program.rs')
| -rw-r--r-- | src/lib/run_program.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/run_program.rs b/src/lib/run_program.rs index 6d6940db872..f8dfa56d950 100644 --- a/src/lib/run_program.rs +++ b/src/lib/run_program.rs @@ -100,17 +100,17 @@ fn start_program(prog: &istr, args: &[istr]) -> @program_res { os::fd_FILE(pipe_err.in), false)); } -fn read_all(rd: &io::reader) -> str { - let buf = ""; +fn read_all(rd: &io::reader) -> istr { + let buf = ~""; while !rd.eof() { let bytes = rd.read_bytes(4096u); - buf += str::unsafe_from_bytes(bytes); + buf += istr::unsafe_from_bytes(bytes); } ret buf; } fn program_output(prog: &istr, args: &[istr]) -> - {status: int, out: str, err: str} { + {status: int, out: istr, err: istr} { let pr = start_program(prog, args); pr.close_input(); ret {status: pr.finish(), |