bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

syntax: Remove io_error usage

Browse source
This commit is contained in:
Alex Crichton 2014-01-29 17:39:21 -08:00
parent ef00c6a278
commit b211b00d21
7 changed files with 1340 additions and 1037 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/ext/source_util.rs
View file

@ -20,7 +20,6 @@ use parse::token::get_ident_interner;
use parse::token;
use print::pprust;
use std::io;
use std::io::File;
use std::rc::Rc;
use std::str;
@ -109,9 +108,9 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
None => return MacResult::dummy_expr()
};
let file = res_rel_file(cx, sp, &Path::new(file));
let bytes = match io::result(|| File::open(&file).read_to_end()) {
let bytes = match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e.desc));
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e));
return MacResult::dummy_expr();
}
Ok(bytes) => bytes,
@ -141,9 +140,9 @@ pub fn expand_include_bin(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
None => return MacResult::dummy_expr()
};
let file = res_rel_file(cx, sp, &Path::new(file));
match io::result(|| File::open(&file).read_to_end()) {
match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e.desc));
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e));
return MacResult::dummy_expr();
}
Ok(bytes) => {