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

Remove more uses of str from std::run. Issue #855

Browse source
This commit is contained in:
Brian Anderson 2011-08-31 14:59:45 -07:00
parent 1772ee3c43
commit 81b31429e4
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/run_program.rs
View file

@ -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(),