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

Merge remote-tracking branch 'rust-lang/master'

Browse source 
Conflicts:
	src/libcore/cell.rs
	src/librustc_driver/test.rs
	src/libstd/old_io/net/tcp.rs
	src/libstd/old_io/process.rs
This commit is contained in:
Brian Anderson 2015-01-27 09:38:30 -08:00
commit 7122305053
219 changed files with 1892 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ use print::pprust;
use ptr::P;
use util::small_vector::SmallVector;
use std::io::File;
use std::old_io::File;
use std::rc::Rc;
// These macros all relate to the file system; they either return
@ -135,7 +135,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
let bytes = match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp,
&format!("couldn't read {:?}: {}",
&format!("couldn't read {}: {}",
file.display(),
e)[]);
return DummyResult::expr(sp);
@ -146,7 +146,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
Ok(src) => {
// Add this input file to the code map to make it available as
// dependency information
let filename = format!("{:?}", file.display());
let filename = format!("{}", file.display());
let interned = token::intern_and_get_ident(&src[]);
cx.codemap().new_filemap(filename, src);
@ -154,7 +154,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",
&format!("{} wasn't a utf-8 file",
file.display())[]);
return DummyResult::expr(sp);
}
@ -171,7 +171,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) => {