From b211b00d21fc7c03c3c378ad5eab60666a00fc08 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 29 Jan 2014 17:39:21 -0800 Subject: syntax: Remove io_error usage --- src/libsyntax/ext/source_util.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index f3f947ec00d..52010b39a54 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -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) => { -- cgit 1.4.1-3-g733a5 From 2a7c5e0b724d8318a7e7762e483c225e8a7420a1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Jan 2014 14:28:44 -0800 Subject: syntax: Remove usage of io_error in tests --- src/libsyntax/ext/expand.rs | 9 ++++----- src/libsyntax/fold.rs | 6 ++++-- src/libsyntax/util/parser_testing.rs | 18 +++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index d8d98b27793..ae93c235ad2 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -957,14 +957,13 @@ mod test { use ast_util; use codemap; use codemap::Spanned; - use fold; use fold::*; use ext::base::{CrateLoader, MacroCrate}; use parse; use parse::token::{fresh_mark, gensym, intern}; use parse::token; use util::parser_testing::{string_to_crate, string_to_crate_and_sess}; - use util::parser_testing::{string_to_pat, string_to_tts, strs_to_idents}; + use util::parser_testing::{string_to_pat, strs_to_idents}; use visit; use visit::Visitor; @@ -1253,14 +1252,14 @@ mod test { let varref_name = mtwt_resolve(varref.segments[0].identifier); let varref_marks = mtwt_marksof(varref.segments[0].identifier.ctxt, invalid_name); - if (!(varref_name==binding_name)){ + if !(varref_name==binding_name) { println!("uh oh, should match but doesn't:"); println!("varref: {:?}",varref); println!("binding: {:?}", bindings[binding_idx]); ast_util::display_sctable(get_sctable()); } assert_eq!(varref_name,binding_name); - if (bound_ident_check) { + if bound_ident_check { // we're checking bound-identifier=?, and the marks // should be the same, too: assert_eq!(varref_marks,binding_marks.clone()); @@ -1269,7 +1268,7 @@ mod test { let fail = (varref.segments.len() == 1) && (mtwt_resolve(varref.segments[0].identifier) == binding_name); // temp debugging: - if (fail) { + if fail { println!("failure on test {}",test_idx); println!("text of test case: \"{}\"", teststr); println!(""); diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 8f5bbc2cdad..297ec6acf51 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -861,6 +861,7 @@ pub fn noop_fold_stmt(s: &Stmt, folder: &mut T) -> SmallVector<@Stmt> #[cfg(test)] mod test { + use std::io; use ast; use util::parser_testing::{string_to_crate, matches_codepattern}; use parse::token; @@ -868,8 +869,9 @@ mod test { use super::*; // this version doesn't care about getting comments or docstrings in. - fn fake_print_crate(s: &mut pprust::State, crate: &ast::Crate) { - pprust::print_mod(s, &crate.module, crate.attrs); + fn fake_print_crate(s: &mut pprust::State, + crate: &ast::Crate) -> io::IoResult<()> { + pprust::print_mod(s, &crate.module, crate.attrs) } // change every identifier to "zz" diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index 58c2bed7a45..aa22f47221b 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -101,30 +101,30 @@ pub fn matches_codepattern(a : &str, b : &str) -> bool { let mut idx_a = 0; let mut idx_b = 0; loop { - if (idx_a == a.len() && idx_b == b.len()) { + if idx_a == a.len() && idx_b == b.len() { return true; } - else if (idx_a == a.len()) {return false;} - else if (idx_b == b.len()) { + else if idx_a == a.len() {return false;} + else if idx_b == b.len() { // maybe the stuff left in a is all ws? - if (is_whitespace(a.char_at(idx_a))) { - return (scan_for_non_ws_or_end(a,idx_a) == a.len()); + if is_whitespace(a.char_at(idx_a)) { + return scan_for_non_ws_or_end(a,idx_a) == a.len(); } else { return false; } } // ws in both given and pattern: - else if (is_whitespace(a.char_at(idx_a)) - && is_whitespace(b.char_at(idx_b))) { + else if is_whitespace(a.char_at(idx_a)) + && is_whitespace(b.char_at(idx_b)) { idx_a = scan_for_non_ws_or_end(a,idx_a); idx_b = scan_for_non_ws_or_end(b,idx_b); } // ws in given only: - else if (is_whitespace(a.char_at(idx_a))) { + else if is_whitespace(a.char_at(idx_a)) { idx_a = scan_for_non_ws_or_end(a,idx_a); } // *don't* silently eat ws in expected only. - else if (a.char_at(idx_a) == b.char_at(idx_b)) { + else if a.char_at(idx_a) == b.char_at(idx_b) { idx_a += 1; idx_b += 1; } -- cgit 1.4.1-3-g733a5