bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fallout of std::str stabilization

Browse source
This commit is contained in:
Alex Crichton 2014-12-10 19:46:38 -08:00
parent 4908017d59
commit 082bfde412
193 changed files with 2143 additions and 2230 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ pub fn expand_file(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
let topmost = cx.original_span_in_file();
let loc = cx.codemap().lookup_char_pos(topmost.lo);
let filename = token::intern_and_get_ident(loc.file.name.as_slice());
let filename = token::intern_and_get_ident(loc.file.name[]);
base::MacExpr::new(cx.expr_str(topmost, filename))
}
@ -65,7 +65,7 @@ pub fn expand_stringify(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
-> Box<base::MacResult+'static> {
let s = pprust::tts_to_string(tts);
base::MacExpr::new(cx.expr_str(sp,
token::intern_and_get_ident(s.as_slice())))
token::intern_and_get_ident(s[])))
}
pub fn expand_mod(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
@ -78,7 +78,7 @@ pub fn expand_mod(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
.connect("::");
base::MacExpr::new(cx.expr_str(
sp,
token::intern_and_get_ident(string.as_slice())))
token::intern_and_get_ident(string[])))
}
/// include! : parse the given file as an expr
@ -137,7 +137,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).as_slice());
e)[]);
return DummyResult::expr(sp);
}
Ok(bytes) => bytes,
@ -147,7 +147,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
// Add this input file to the code map to make it available as
// dependency information
let filename = file.display().to_string();
let interned = token::intern_and_get_ident(src.as_slice());
let interned = token::intern_and_get_ident(src[]);
cx.codemap().new_filemap(filename, src);
base::MacExpr::new(cx.expr_str(sp, interned))
@ -155,7 +155,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()).as_slice());
file.display())[]);
return DummyResult::expr(sp);
}
}
@ -171,9 +171,7 @@ pub fn expand_include_bin(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).as_slice());
format!("couldn't read {}: {}", file.display(), e)[]);
return DummyResult::expr(sp);
}
Ok(bytes) => {