---

yaml
---
r: 144824
b: refs/heads/try2
c: e29d253
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b9bb4abcb66804e4b78704068703f0dab5c72887
+refs/heads/try2: e29d25338d7b0374f3dd5976b57463e6aafab0ac
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/expand.rs

@@ -1501,21 +1501,6 @@ pub fn new_rename_folder(from : ast::Ident, to : ast::Name) -> @AstFoldFns {
     fun_to_ctxt_folder(@Renamer{from:from,to:to})
 }
 
-/*
-// perform resolution (in the MTWT sense) on all of the
-// idents in the tree. This is the final step in expansion.
-// FIXME #6993: this function could go away, along with
-// the separate mtwt_resolution pass
-pub fn new_ident_resolver() ->
-    @fn(ast::Ident)->ast::Ident {
-    |id : ast::Ident|
-    ast::Ident {
-        name : mtwt_resolve(id),
-        ctxt : EMPTY_CTXT
-    }
-}
-*/
-
 // apply a given mark to the given token trees. Used prior to expansion of a macro.
 fn mark_tts(tts : &[token_tree], m : Mrk) -> ~[token_tree] {
     fold_tts(tts,new_mark_folder(m) as @ast_fold)