From e1734f6d38a84bea8a4fd3a8a5ed09ae2666cf14 Mon Sep 17 00:00:00 2001
From: John Clements <clements@racket-lang.org>
Date: Tue, 9 Jul 2013 14:09:30 -0700
Subject: [PATCH] rename resolve to mtwt_resolve

---
 src/libsyntax/ast_util.rs   | 2 +-
 src/libsyntax/ext/expand.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 5ee8537750ed..0e402731c664 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -915,7 +915,7 @@ fn idx_push<T>(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 ea277a8a625e..8781dd1feff2 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -12,7 +12,7 @@ use ast::{Block, Crate, NodeId, Expr_, ExprMac, Ident, mac_invoc_tt};
 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::*;