debuginfo: Fixed some merge fallout

Author: michaelwoerister

src/librustc/middle/trans/debuginfo.rs

@@ -245,7 +245,7 @@ pub fn create_captured_var_metadata(bcx: @mut Block,
             cx.sess.span_bug(span, "debuginfo::create_captured_var_metadata() - NodeId not found");
         }
         Some(ast_map::node_local(ident)) => ident,
-        Some(ast_map::node_arg(@ast::pat { node: ast::pat_ident(_, ref path, _), _ })) => {
+        Some(ast_map::node_arg(@ast::Pat { node: ast::PatIdent(_, ref path, _), _ })) => {
             ast_util::path_to_ident(path)
         }
         _ => {

src/libsyntax/ast_map.rs

@@ -73,7 +73,7 @@ pub enum ast_node {
     node_variant(variant, @item, @path),
     node_expr(@Expr),
     node_stmt(@Stmt),
-    node_arg(@pat),
+    node_arg(@Pat),
     node_local(Ident),
     node_block(Block),
     node_struct_ctor(@struct_def, @item, @path),