diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-01-27 16:44:40 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-27 16:44:40 -0800 |
| commit | 3321880f1304943a87f3b9756de642417eb82d1b (patch) | |
| tree | c9306f591e39bf02808b437ce67cd780b47b8524 /src/libstd/run_program.rs | |
| parent | 7e620f87a6f524434fdcaffa9d84bad1f7f5e13e (diff) | |
| parent | 3afc16f7a4ce66910107843b8f5cfbea3ad28a09 (diff) | |
| download | rust-3321880f1304943a87f3b9756de642417eb82d1b.tar.gz rust-3321880f1304943a87f3b9756de642417eb82d1b.zip | |
Merge remote-tracking branch 'killerswan/fixing_strings_2'
Conflicts: src/comp/driver/driver.rs src/comp/middle/trans/base.rs src/comp/syntax/parse/lexer.rs
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; |