auto merge of #15999 : Kimundi/rust/fix_folder, r=nikomatsakis

[rust.git] / src / libsyntax / ast_map / mod.rs

diff --git a/src/libsyntax/ast_map/mod.rs b/src/libsyntax/ast_map/mod.rs
index 50e487b63db1f66bdf4d35a7239b687e653c6fa1..67de8e7aba10207cc4a8ee58de7605523beead53 100644 (file)
--- a/src/libsyntax/ast_map/mod.rs
+++ b/src/libsyntax/ast_map/mod.rs
@@ -320,13 +320,15 @@ pub fn get_path_elem(&self, id: NodeId) -> PathElem {
             }
             NodeForeignItem(i) => PathName(i.ident.name),
             NodeMethod(m) => match m.node {
-                MethDecl(ident, _, _, _, _, _, _) => PathName(ident.name),
+                MethDecl(ident, _, _, _, _, _, _, _) => PathName(ident.name),
                 MethMac(_) => fail!("no path elem for {:?}", node)
             },
             NodeTraitMethod(tm) => match *tm {
                 Required(ref m) => PathName(m.ident.name),
                 Provided(m) => match m.node {
-                    MethDecl(ident, _, _, _, _, _, _) => PathName(ident.name),
+                    MethDecl(ident, _, _, _, _, _, _, _) => {
+                        PathName(ident.name)
+                    }
                     MethMac(_) => fail!("no path elem for {:?}", node),
                 }
             },
@@ -604,7 +606,7 @@ fn fold_lifetime(&mut self, lifetime: &Lifetime) -> Lifetime {
     }
 
     fn fold_mac(&mut self, mac: &Mac) -> Mac {
-        fold::fold_mac(mac, self)
+        fold::noop_fold_mac(mac, self)
     }
 }
 
@@ -709,7 +711,7 @@ fn node_id_to_string(map: &Map, id: NodeId) -> String {
             format!("foreign item {} (id={})", path_str, id)
         }
         Some(NodeMethod(m)) => match m.node {
-            MethDecl(ident, _, _, _, _, _, _) =>
+            MethDecl(ident, _, _, _, _, _, _, _) =>
                 format!("method {} in {} (id={})",
                         token::get_ident(ident),
                         map.path_to_string(id), id),