Skip to content

Commit e0d78ee

Browse files
nikomatsakisJorge Aparicio
authored andcommitted
---
yaml --- r: 171845 b: refs/heads/beta c: f97b124 h: refs/heads/master i: 171843: 493ac0b v: v3
1 parent b8fd4be commit e0d78ee

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
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 79af27762324f28ab13335864111071b8708ea39
34+
refs/heads/beta: f97b124a44944feb41c39a4478eda55dbc5da44d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/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);

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