From 78dd07b729375119d1fa020427fc064c045524ed Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Wed, 14 Aug 2013 16:50:46 +0200
Subject: [PATCH] Ported rusti::utils from oldvisit to <V:Visitor> trait API.

---
 src/librusti/utils.rs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/librusti/utils.rs b/src/librusti/utils.rs
index 94c0e4fe01e5..467a3fdc2783 100644
--- a/src/librusti/utils.rs
+++ b/src/librusti/utils.rs
@@ -13,24 +13,31 @@ use syntax::ast;
 use syntax::print::pp;
 use syntax::print::pprust;
 use syntax::parse::token;
+use syntax::visit;
 
-pub fn each_binding(l: @ast::Local, f: @fn(&ast::Path, ast::NodeId)) {
-    use syntax::oldvisit;
+struct EachBindingVisitor {
+    f: @fn(&ast::Path, ast::NodeId)
+}
 
-    let vt = oldvisit::mk_simple_visitor(
-        @oldvisit::SimpleVisitor {
-            visit_pat: |pat| {
+impl visit::Visitor<()> for EachBindingVisitor {
+    fn visit_pat(&mut self, pat:@ast::pat, _:()) {
                 match pat.node {
                     ast::pat_ident(_, ref path, _) => {
-                        f(path, pat.id);
+                        (self.f)(path, pat.id);
                     }
                     _ => {}
                 }
-            },
-            .. *oldvisit::default_simple_visitor()
-        }
-    );
-    (vt.visit_pat)(l.pat, ((), vt));
+
+                visit::walk_pat(self, pat, ());
+    }
+}
+
+pub fn each_binding(l: @ast::Local, f: @fn(&ast::Path, ast::NodeId)) {
+    use syntax::visit::Visitor;
+
+    let mut vt = EachBindingVisitor{ f: f };
+
+    vt.visit_pat(l.pat, ());
 }
 
 /// A utility function that hands off a pretty printer to a callback.