Skip to content

Commit 0924e0c

Browse files
nikomatsakisJorge Aparicio
authored andcommitted
---
yaml --- r: 170751 b: refs/heads/try c: f97b124 h: refs/heads/master i: 170749: c26ec0c 170747: f1580fc 170743: 14eab1a 170735: 0a63030 170719: 9b940d2 170687: cbb46ee 170623: 52cdaaa 170495: b67c986 v: v3
1 parent 3dc531a commit 0924e0c

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: 79af27762324f28ab13335864111071b8708ea39
5+
refs/heads/try: f97b124a44944feb41c39a4478eda55dbc5da44d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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