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

libstd: Remove ~str from all libstd modules except fmt and str.

Browse Source
This commit is contained in:
Patrick Walton
2014-05-16 10:45:16 -07:00
parent e402e75f4e
commit 36195eb91f
204 changed files with 2102 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,10 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
let file = res_rel_file(cx, sp, &Path::new(file));
let bytes = match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e));
cx.span_err(sp,
format!("couldn't read {}: {}",
file.display(),
e).as_slice());
return DummyResult::expr(sp);
}
Ok(bytes) => bytes,
@@ -127,7 +130,9 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
base::MacExpr::new(cx.expr_str(sp, interned))
}
None => {
cx.span_err(sp, format!("{} wasn't a utf-8 file", file.display()));
cx.span_err(sp,
format!("{} wasn't a utf-8 file",
file.display()).as_slice());
return DummyResult::expr(sp);
}
}
@@ -142,7 +147,10 @@ pub fn expand_include_bin(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
let file = res_rel_file(cx, sp, &Path::new(file));
match File::open(&file).read_to_end() {
Err(e) => {
cx.span_err(sp, format!("couldn't read {}: {}", file.display(), e));
cx.span_err(sp,
format!("couldn't read {}: {}",
file.display(),
e).as_slice());
return DummyResult::expr(sp);
}
Ok(bytes) => {