diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-10-31 16:04:10 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-10-31 16:11:27 -0700 |
| commit | 45d04f5704dbffded1b14c2d4a2c186b91552ebe (patch) | |
| tree | 2ba41e34bf6f2911605910d5a78be0425c70d150 | |
| parent | 740763fdeff059a8cb67ac6b09eaf9b9e155f661 (diff) | |
| download | rust-45d04f5704dbffded1b14c2d4a2c186b91552ebe.tar.gz rust-45d04f5704dbffded1b14c2d4a2c186b91552ebe.zip | |
rustc: Swap argument order in drop_and_cancel_clean
| -rw-r--r-- | src/rustc/middle/trans/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustc/middle/trans/expr.rs b/src/rustc/middle/trans/expr.rs index dd50c6f4b30..839a8241963 100644 --- a/src/rustc/middle/trans/expr.rs +++ b/src/rustc/middle/trans/expr.rs @@ -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 { |