rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Round 3 test fixes and conflicts

Browse Source
This commit is contained in:
Alex Crichton
2015-02-18 15:58:07 -08:00
parent 1506b34e0c
commit d6e939a2df
28 changed files with 127 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/ext/source_util.rs
View File

@@ -117,7 +117,7 @@ pub fn expand_include<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree
None => self.p.span_fatal(
self.p.span,
&format!("expected item, found `{}`",
self.p.this_token_to_string())[]
self.p.this_token_to_string())
)
}
}
@@ -141,7 +141,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
cx.span_err(sp,
&format!("couldn't read {}: {}",
file.display(),
e)[]);
e));
return DummyResult::expr(sp);
}
Ok(bytes) => bytes,
@@ -159,7 +159,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
Err(_) => {
cx.span_err(sp,
&format!("{} wasn't a utf-8 file",
file.display())[]);
file.display()));
return DummyResult::expr(sp);
}
}
@@ -175,7 +175,7 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp,
&format!("couldn't read {}: {}", file.display(), e)[]);
&format!("couldn't read {}: {}", file.display(), e));
return DummyResult::expr(sp);
}
Ok(bytes) => {