---

yaml
---
r: 143057
b: refs/heads/try2
c: d8c27c3
h: refs/heads/master
i:
  143055: 42cda62
v: v3

Author: michaelwoerister

[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: 72cf2ee1368d385fa13772fd70b7a9e748aaec6b
+refs/heads/try2: d8c27c3446582a318b35103e6ec3594c53f196b1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/debuginfo.rs

@@ -289,8 +289,15 @@ pub fn create_function_metadata(fcx: fn_ctxt) -> DISubprogram {
                                            "create_function_metadata: item bound to non-function")
             }
         }
-        ast_map::node_method(@ast::method { decl: ast::fn_decl { output: ref ty, _ },
-                             id: id, ident: ident, _}, _, _) => {
+        ast_map::node_method(
+            @ast::method {
+                decl: ast::fn_decl { output: ref ty, _ },
+                id: id,
+                ident: ident,
+                _
+            },
+            _,
+            _) => {
             (ident, ty, id)
         }
         ast_map::node_expr(ref expr) => {
@@ -309,10 +316,10 @@ pub fn create_function_metadata(fcx: fn_ctxt) -> DISubprogram {
                     decl: ast::fn_decl { output: ref ty, _ },
                     id: id,
                     ident: ident,
-                    _}
-            ),
-            _def_id,
-            _path) => {
+                    _
+                }),
+            _,
+            _) => {
             (ident, ty, id)
         }
         _ => fcx.ccx.sess.bug("create_function_metadata: unexpected sort of node")