diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2012-01-28 11:50:48 -0500 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2012-01-28 11:50:48 -0500 |
| commit | a831e7ce13aa19acf0f65e508097351f8dabca84 (patch) | |
| tree | e8b14ee2373337d3867ee573d61227387191c962 /src/libstd/run_program.rs | |
| parent | fcb381410d59b89336a528103582a956334c9777 (diff) | |
| parent | 0794195fbdb6efa34388dfdf3dfc968bbbf06215 (diff) | |
| download | rust-a831e7ce13aa19acf0f65e508097351f8dabca84.tar.gz rust-a831e7ce13aa19acf0f65e508097351f8dabca84.zip | |
Merge remote-tracking branch 'mozilla/master'
Diffstat (limited to 'src/libstd/run_program.rs')
| -rw-r--r-- | src/libstd/run_program.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/run_program.rs b/src/libstd/run_program.rs index e40526b5884..5b2de1e57d0 100644 --- a/src/libstd/run_program.rs +++ b/src/libstd/run_program.rs @@ -216,7 +216,7 @@ fn read_all(rd: io::reader) -> str { let buf = ""; while !rd.eof() { let bytes = rd.read_bytes(4096u); - buf += str::unsafe_from_bytes(bytes); + buf += str::from_bytes(bytes); } ret buf; } @@ -347,7 +347,7 @@ mod tests { let buf = ""; while !reader.eof() { let bytes = reader.read_bytes(4096u); - buf += str::unsafe_from_bytes(bytes); + buf += str::from_bytes(bytes); } os::fclose(file); ret buf; |