Skip to content

Commit 45d04f5

Browse files
committed
rustc: Swap argument order in drop_and_cancel_clean
1 parent 740763f commit 45d04f5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/rustc/middle/trans/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl Dest : cmp::Eq {
159159
pure fn ne(other: &Dest) -> bool { !self.eq(other) }
160160
}
161161

162-
fn drop_and_cancel_clean(dat: Datum, bcx: block) -> block {
162+
fn drop_and_cancel_clean(bcx: block, dat: Datum) -> block {
163163
let bcx = dat.drop_val(bcx);
164164
dat.cancel_clean(bcx);
165165
return bcx;
@@ -587,7 +587,7 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
587587
if bcx.expr_is_lval(a) {
588588
let datum = unpack_datum!(bcx, trans_to_datum(bcx, a));
589589
return match dest {
590-
Ignore => drop_and_cancel_clean(datum, bcx),
590+
Ignore => drop_and_cancel_clean(bcx, datum),
591591
SaveIn(addr) => datum.move_to(bcx, INIT, addr)
592592
};
593593
} else {

0 commit comments

Comments
 (0)