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

stdlib: Make io failures recoverable by returning a result

Browse source
This commit is contained in:
Brian Anderson 2011-10-28 21:19:59 -07:00
parent 2b62a80202
commit 2cebef095e
11 changed files with 123 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/compiletest/header.rs
View file

@ -63,7 +63,7 @@ fn is_test_ignored(config: config, testfile: str) -> bool {
}
fn iter_header(testfile: str, it: block(str)) {
let rdr = io::file_reader(testfile);
let rdr = std::result::get(io::file_reader(testfile));
while !rdr.eof() {
let ln = rdr.read_line();

8
src/compiletest/runtest.rs
View file

@ -5,6 +5,7 @@ import std::fs;
import std::os;
import std::vec;
import std::test;
import std::result;
import common::mode_run_pass;
import common::mode_run_fail;
@ -92,7 +93,7 @@ fn run_pretty_test(cx: cx, props: test_props, testfile: str) {
let rounds =
alt props.pp_exact { option::some(_) { 1 } option::none. { 2 } };
let srcs = [io::read_whole_file_str(testfile)];
let srcs = [result::get(io::read_whole_file_str(testfile))];
let round = 0;
while round < rounds {
@ -112,7 +113,7 @@ fn run_pretty_test(cx: cx, props: test_props, testfile: str) {
alt props.pp_exact {
option::some(file) {
let filepath = fs::connect(fs::dirname(testfile), file);
io::read_whole_file_str(filepath)
result::get(io::read_whole_file_str(filepath))
}
option::none. { srcs[vec::len(srcs) - 2u] }
};
@ -339,7 +340,8 @@ fn dump_output(config: config, testfile: str, out: str, err: str) {
#[cfg(target_os = "linux")]
fn dump_output_file(config: config, testfile: str, out: str, extension: str) {
let outfile = make_out_name(config, testfile, extension);
let writer = io::file_writer(outfile, [io::create, io::truncate]);
let writer = result::get(
io::file_writer(outfile, [io::create, io::truncate]));
writer.write_str(out);
}