Skip to content

Commit bd5e6ea

Browse files
---
yaml --- r: 64471 b: refs/heads/snap-stage3 c: d8c27c3 h: refs/heads/master i: 64469: baf2d6c 64467: caf50b9 64463: 5870094 v: v3
1 parent effdd56 commit bd5e6ea

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 72cf2ee1368d385fa13772fd70b7a9e748aaec6b
4+
refs/heads/snap-stage3: d8c27c3446582a318b35103e6ec3594c53f196b1
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/debuginfo.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,15 @@ pub fn create_function_metadata(fcx: fn_ctxt) -> DISubprogram {
289289
"create_function_metadata: item bound to non-function")
290290
}
291291
}
292-
ast_map::node_method(@ast::method { decl: ast::fn_decl { output: ref ty, _ },
293-
id: id, ident: ident, _}, _, _) => {
292+
ast_map::node_method(
293+
@ast::method {
294+
decl: ast::fn_decl { output: ref ty, _ },
295+
id: id,
296+
ident: ident,
297+
_
298+
},
299+
_,
300+
_) => {
294301
(ident, ty, id)
295302
}
296303
ast_map::node_expr(ref expr) => {
@@ -309,10 +316,10 @@ pub fn create_function_metadata(fcx: fn_ctxt) -> DISubprogram {
309316
decl: ast::fn_decl { output: ref ty, _ },
310317
id: id,
311318
ident: ident,
312-
_}
313-
),
314-
_def_id,
315-
_path) => {
319+
_
320+
}),
321+
_,
322+
_) => {
316323
(ident, ty, id)
317324
}
318325
_ => fcx.ccx.sess.bug("create_function_metadata: unexpected sort of node")

0 commit comments

Comments
 (0)