diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 5ee8537750e..0e402731c66 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -915,7 +915,7 @@ fn idx_push(vec: &mut ~[T], val: T) -> uint { } /// Resolve a syntax object to a name, per MTWT. -pub fn resolve(id : Ident) -> Name { +pub fn mtwt_resolve(id : Ident) -> Name { resolve_internal(id, get_sctable()) } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index ea277a8a625..8781dd1feff 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -12,7 +12,7 @@ use ast::{item_mac, Stmt_, StmtMac, StmtExpr, StmtSemi}; use ast::{ILLEGAL_CTXT}; use ast; -use ast_util::{new_rename, new_mark, resolve}; +use ast_util::{new_rename, new_mark, mtwt_resolve}; use attr; use attr::AttrMetaMethods; use codemap; @@ -1218,12 +1218,11 @@ pub fn new_ident_resolver() -> @fn(ast::Ident)->ast::Ident { |id : ast::Ident| ast::Ident { - name : resolve(id), + name : mtwt_resolve(id), ctxt : ILLEGAL_CTXT } } - #[cfg(test)] mod test { use super::*;