let topmost = cx.original_span_in_file();
let loc = cx.codemap().lookup_char_pos(topmost.lo);
- base::MacExpr::new(cx.expr_uint(topmost, loc.line))
+ base::MacExpr::new(cx.expr_usize(topmost, loc.line))
}
/* column!(): expands to the current column number */
let topmost = cx.original_span_in_file();
let loc = cx.codemap().lookup_char_pos(topmost.lo);
- base::MacExpr::new(cx.expr_uint(topmost, loc.col.to_uint()))
+ base::MacExpr::new(cx.expr_usize(topmost, loc.col.to_usize()))
}
/// file!(): expands to the current filename */
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[]);
+ let filename = token::intern_and_get_ident(&loc.file.name[]);
base::MacExpr::new(cx.expr_str(topmost, filename))
}
-> Box<base::MacResult+'static> {
let s = pprust::tts_to_string(tts);
base::MacExpr::new(cx.expr_str(sp,
- token::intern_and_get_ident(s[])))
+ token::intern_and_get_ident(&s[])))
}
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[])))
+ token::intern_and_get_ident(&string[])))
}
/// include! : parse the given file as an expr
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);
Ok(src) => {
// 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[]);
+ let filename = format!("{:?}", file.display());
+ let interned = token::intern_and_get_ident(&src[]);
cx.codemap().new_filemap(filename, src);
base::MacExpr::new(cx.expr_str(sp, interned))
}
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);
}
}
}
-pub fn expand_include_bin(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
- -> Box<base::MacResult+'static> {
- cx.span_warn(sp, "include_bin! is deprecated; use include_bytes! instead");
- expand_include_bytes(cx, sp, tts)
-}
-
pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
-> Box<base::MacResult+'static> {
let file = match get_single_str_from_tts(cx, sp, tts, "include_bytes!") {
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) => {