From 45d04f5704dbffded1b14c2d4a2c186b91552ebe Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 31 Oct 2012 16:04:10 -0700
Subject: [PATCH] rustc: Swap argument order in drop_and_cancel_clean

---
 src/rustc/middle/trans/expr.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rustc/middle/trans/expr.rs b/src/rustc/middle/trans/expr.rs
index dd50c6f4b301d..839a8241963f9 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 {