Merge remote-tracking branch 'remotes/origin/master' into str-remove-null

[rust.git] / src / librustc / middle / trans / asm.rs

diff --git a/src/librustc/middle/trans/asm.rs b/src/librustc/middle/trans/asm.rs
index 9973599e339545f69778b0204533754f0ed4825b..b6057199a280fbccddba02aefe60d7b20f42c5f7 100644 (file)
--- a/src/librustc/middle/trans/asm.rs
+++ b/src/librustc/middle/trans/asm.rs
@@ -42,7 +42,6 @@ pub fn trans_inline_asm(bcx: @mut Block, ia: &ast::inline_asm) -> @mut Block {
                                    ty::ByCopy,
                                    out,
                                    &mut cleanups,
-                                   None,
                                    callee::DontAutorefArg)
         }));
 
@@ -57,13 +56,12 @@ pub fn trans_inline_asm(bcx: @mut Block, ia: &ast::inline_asm) -> @mut Block {
                                    ty::ByCopy,
                                    e,
                                    &mut cleanups,
-                                   None,
                                    callee::DontAutorefArg)
         })
 
     };
 
-    foreach c in cleanups.iter() {
+    for c in cleanups.iter() {
         revoke_clean(bcx, *c);
     }
     cleanups.clear();
@@ -78,13 +76,12 @@ pub fn trans_inline_asm(bcx: @mut Block, ia: &ast::inline_asm) -> @mut Block {
                                    ty::ByCopy,
                                    input,
                                    &mut cleanups,
-                                   None,
                                    callee::DontAutorefArg)
         })
 
     };
 
-    foreach c in cleanups.iter() {
+    for c in cleanups.iter() {
         revoke_clean(bcx, *c);
     }
 
@@ -134,7 +131,7 @@ pub fn trans_inline_asm(bcx: @mut Block, ia: &ast::inline_asm) -> @mut Block {
         let op = PointerCast(bcx, aoutputs[0], val_ty(outputs[0]).ptr_to());
         Store(bcx, r, op);
     } else {
-        foreach (i, o) in aoutputs.iter().enumerate() {
+        for (i, o) in aoutputs.iter().enumerate() {
             let v = ExtractValue(bcx, r, i);
             let op = PointerCast(bcx, *o, val_ty(outputs[i]).ptr_to());
             Store(bcx, v, op);