bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move syntax::util::interner -> syntax::symbol, cleanup.

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-11-16 08:21:52 +00:00
parent f177a00ac9
commit d2f8fb0a0a
102 changed files with 752 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libsyntax_ext/env.rs
View file

@ -17,7 +17,7 @@ use syntax::ast;
use syntax::ext::base::*;
use syntax::ext::base;
use syntax::ext::build::AstBuilder;
use syntax::parse::token;
use syntax::symbol::intern_and_get_ident;
use syntax_pos::Span;
use syntax::tokenstream;
@ -49,7 +49,7 @@ pub fn expand_option_env<'cx>(cx: &'cx mut ExtCtxt,
Ok(s) => {
cx.expr_call_global(sp,
cx.std_path(&["option", "Option", "Some"]),
vec![cx.expr_str(sp, token::intern_and_get_ident(&s[..]))])
vec![cx.expr_str(sp, intern_and_get_ident(&s[..]))])
}
};
MacEager::expr(e)
@ -73,7 +73,7 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt,
Some((v, _style)) => v,
};
let msg = match exprs.next() {
None => token::intern_and_get_ident(&format!("environment variable `{}` not defined", var)),
None => intern_and_get_ident(&format!("environment variable `{}` not defined", var)),
Some(second) => {
match expr_to_string(cx, second, "expected string literal") {
None => return DummyResult::expr(sp),
@ -92,7 +92,7 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt,
cx.span_err(sp, &msg);
cx.expr_usize(sp, 0)
}
Ok(s) => cx.expr_str(sp, token::intern_and_get_ident(&s)),
Ok(s) => cx.expr_str(sp, intern_and_get_ident(&s)),
};
MacEager::expr(e)
}