Skip to content

Commit ede0ac3

Browse files
nikomatsakisJorge Aparicio
authored andcommitted
---
yaml --- r: 169343 b: refs/heads/master c: f97b124 h: refs/heads/master i: 169341: 5e6059f 169339: 830c5d7 169335: 7ccd8db 169327: 85309da 169311: 5251c38 169279: 5fa2ffc 169215: 9584f50 v: v3
1 parent f0e95e6 commit ede0ac3

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 79af27762324f28ab13335864111071b8708ea39
2+
refs/heads/master: f97b124a44944feb41c39a4478eda55dbc5da44d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/librustc_trans/trans/callee.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn trans<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, expr: &ast::Expr)
100100

101101
fn datum_callee<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, expr: &ast::Expr)
102102
-> Callee<'blk, 'tcx> {
103-
let DatumBlock { datum, .. } = expr::trans(bcx, expr);
103+
let DatumBlock { mut bcx, datum, .. } = expr::trans(bcx, expr);
104104
match datum.ty.sty {
105105
ty::ty_bare_fn(..) => {
106106
let llval = datum.to_llscalarish(bcx);

trunk/src/test/run-pass/call-closure-from-overloaded-op.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test FIXME(japaric) this ICEs
12-
1311
fn foo() -> int { 22 }
1412

1513
pub fn main() {

0 commit comments

Comments
 (0)