diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index df177cf75dc..047fc541ba8 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -93,7 +93,7 @@ pub fn expand_include_str(cx: @ExtCtxt, sp: Span, tts: &[ast::token_tree]) let file = get_single_str_from_tts(cx, sp, tts, "include_str!"); let file = res_rel_file(cx, sp, &Path::new(file)); let mut error = None; - let bytes = do io::read_error::cond.trap(|e| error = Some(e)).inside { + let bytes = do io::io_error::cond.trap(|e| error = Some(e)).inside { file.open_reader(io::Open).read_to_end() }; match error { @@ -120,10 +120,8 @@ pub fn expand_include_bin(cx: @ExtCtxt, sp: Span, tts: &[ast::token_tree]) let file = res_rel_file(cx, sp, &Path::new(file)); let mut error = None; - let bytes = do io::read_error::cond.trap(|e| error = Some(e)).inside { - do io::io_error::cond.trap(|e| error = Some(e)).inside { - file.open_reader(io::Open).read_to_end() - } + let bytes = do io::io_error::cond.trap(|e| error = Some(e)).inside { + file.open_reader(io::Open).read_to_end() }; match error { Some(e) => { diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 93e5d3dd772..fad9eab7542 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -271,9 +271,7 @@ pub fn file_to_filemap(sess: @mut ParseSess, path: &Path, spanopt: Option<Span>) }; let mut error = None; let bytes = do io::io_error::cond.trap(|e| error = Some(e)).inside { - do io::read_error::cond.trap(|e| error = Some(e)).inside { - path.open_reader(io::Open).read_to_end() - } + path.open_reader(io::Open).read_to_end() }; match error { Some(e) => { |