From 86e02554fd3e3795626cba4d50de6243c19ff972 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 12 Sep 2012 11:15:39 -0700
Subject: Make moves in arguments explicit in libsyntax and rustc

---
 src/rustc/back/link.rs              | 2 +-
 src/rustc/driver/rustc.rs           | 2 +-
 src/rustc/middle/trans/base.rs      | 2 +-
 src/rustc/middle/trans/common.rs    | 2 +-
 src/rustc/middle/trans/debuginfo.rs | 2 +-
 src/rustc/middle/ty.rs              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/rustc')

diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs
index 18c63c1934b..1058028f7e9 100644
--- a/src/rustc/back/link.rs
+++ b/src/rustc/back/link.rs
@@ -96,7 +96,7 @@ mod jit {
                 code: ptr,
                 env: ptr::null()
             };
-            let func: fn(~[~str]) = unsafe::transmute(closure);
+            let func: fn(~[~str]) = unsafe::transmute(move closure);
 
             func(~[sess.opts.binary]);
         }
diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs
index 1ccd27c786b..28e94e280bf 100644
--- a/src/rustc/driver/rustc.rs
+++ b/src/rustc/driver/rustc.rs
@@ -228,7 +228,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
     let p = comm::Port();
     let ch = comm::Chan(p);
 
-    match do task::try  {
+    match do task::try |move f| {
 
         // The 'diagnostics emitter'. Every error, warning, etc. should
         // go through this function.
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index f993ed6bec7..98b942ace2b 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -1046,7 +1046,7 @@ fn new_block(cx: fn_ctxt, parent: Option<block>, +kind: block_kind,
     let llbb: BasicBlockRef = str::as_c_str(cx.ccx.sess.str_of(s), |buf| {
         llvm::LLVMAppendBasicBlock(cx.llfn, buf)
     });
-    let bcx = mk_block(llbb, parent, kind, is_lpad, opt_node_info, cx);
+    let bcx = mk_block(llbb, parent, move kind, is_lpad, opt_node_info, cx);
     do option::iter(parent) |cx| {
         if cx.unreachable { Unreachable(bcx); }
     };
diff --git a/src/rustc/middle/trans/common.rs b/src/rustc/middle/trans/common.rs
index 87e27bcf6d7..03ccea0ad50 100644
--- a/src/rustc/middle/trans/common.rs
+++ b/src/rustc/middle/trans/common.rs
@@ -527,7 +527,7 @@ enum block = @block_;
 fn mk_block(llbb: BasicBlockRef, parent: Option<block>, -kind: block_kind,
             is_lpad: bool, node_info: Option<node_info>, fcx: fn_ctxt)
     -> block {
-    block(@block_(llbb, parent, kind, is_lpad, node_info, fcx))
+    block(@block_(llbb, parent, move kind, is_lpad, node_info, fcx))
 }
 
 // First two args are retptr, env
diff --git a/src/rustc/middle/trans/debuginfo.rs b/src/rustc/middle/trans/debuginfo.rs
index fe01a202e60..fc0c462e935 100644
--- a/src/rustc/middle/trans/debuginfo.rs
+++ b/src/rustc/middle/trans/debuginfo.rs
@@ -131,7 +131,7 @@ enum debug_metadata {
 
 fn cast_safely<T: Copy, U>(val: T) -> U unsafe {
     let val2 = val;
-    return unsafe::transmute(val2);
+    return unsafe::transmute(move val2);
 }
 
 fn md_from_metadata<T>(val: debug_metadata) -> T unsafe {
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 2edf0178e32..631efe4a766 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -383,7 +383,7 @@ type t = *t_opaque;
 pure fn get(t: t) -> t_box unsafe {
     let t2 = unsafe::reinterpret_cast::<t, t_box>(&t);
     let t3 = t2;
-    unsafe::forget(t2);
+    unsafe::forget(move t2);
     t3
 }
 
-- 
cgit 1.4.1-3-g733a5