---

yaml
---
r: 79259
b: refs/heads/auto
c: e29d253
h: refs/heads/master
i:
  79257: 2e6c547
  79255: a68db2f
v: v3

Author: jbclements

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b9bb4abcb66804e4b78704068703f0dab5c72887
+refs/heads/auto: e29d25338d7b0374f3dd5976b57463e6aafab0ac
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)