user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: Swap argument order in drop_and_cancel_clean

Browse source
This commit is contained in:
Brian Anderson 2012-10-31 16:04:10 -07:00
parent 740763fdef
commit 45d04f5704
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rustc/middle/trans/expr.rs
View file

@ -159,7 +159,7 @@ impl Dest : cmp::Eq {
pure fn ne(other: &Dest) -> bool { !self.eq(other) }
}
fn drop_and_cancel_clean(dat: Datum, bcx: block) -> block {
fn drop_and_cancel_clean(bcx: block, dat: Datum) -> block {
let bcx = dat.drop_val(bcx);
dat.cancel_clean(bcx);
return bcx;
@ -587,7 +587,7 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
if bcx.expr_is_lval(a) {
let datum = unpack_datum!(bcx, trans_to_datum(bcx, a));
return match dest {
Ignore => drop_and_cancel_clean(datum, bcx),
Ignore => drop_and_cancel_clean(bcx, datum),
SaveIn(addr) => datum.move_to(bcx, INIT, addr)
};
} else {