Skip to content

Commit 773b4ce

Browse files
---
yaml --- r: 69098 b: refs/heads/auto c: d8c27c3 h: refs/heads/master v: v3
1 parent cc59f23 commit 773b4ce

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
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 72cf2ee1368d385fa13772fd70b7a9e748aaec6b
17+
refs/heads/auto: d8c27c3446582a318b35103e6ec3594c53f196b1
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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)