Make moves explicit in arguments

11 files changed, 25 insertions, 22 deletions

diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index 3482329efde..ae696d912cd 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -221,7 +221,7 @@ fn Bitv (nbits: uint, init: bool) -> Bitv {
                      if nbits % uint_bits == 0 {0} else {1};
         let elem = if init {!0} else {0};
         let s = to_mut(from_elem(nelems, elem));
-        Big(~BigBitv(s))
+        Big(~BigBitv(move s))
     };
     Bitv {rep: rep, nbits: nbits}
 }
diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs
index 8948d66f7ab..bc16aa2e03e 100644
--- a/src/libstd/cell.rs
+++ b/src/libstd/cell.rs
@@ -26,7 +26,7 @@ impl<T> Cell<T> {
 
         let mut value = None;
         value <-> self.value;
-        return option::unwrap(value);
+        return option::unwrap(move value);
     }
 
     /// Returns the value, failing if the cell is full.
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index 0935834eb44..1eac198c773 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -57,7 +57,7 @@ fn create<T: Copy>() -> Deque<T> {
                 self.lo = self.elts.len() - 1u;
             } else { self.lo -= 1u; }
             if self.lo == self.hi {
-                self.elts.swap(|v| grow(self.nelts, oldlo, v));
+                self.elts.swap(|v| grow(self.nelts, oldlo, move v));
                 self.lo = self.elts.len() - 1u;
                 self.hi = self.nelts;
             }
@@ -66,7 +66,7 @@ fn create<T: Copy>() -> Deque<T> {
         }
         fn add_back(t: T) {
             if self.lo == self.hi && self.nelts != 0u {
-                self.elts.swap(|v| grow(self.nelts, self.lo, v));
+                self.elts.swap(|v| grow(self.nelts, self.lo, move v));
                 self.lo = 0u;
                 self.hi = self.nelts;
             }
@@ -111,7 +111,7 @@ fn create<T: Copy>() -> Deque<T> {
                 vec::to_mut(
                     vec::from_elem(initial_capacity, None)))
     };
-    move (repr as Deque::<T>)
+    (move repr) as Deque::<T>
 }
 
 #[cfg(test)]
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index a24d360beca..dad1fd6f6f9 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -279,7 +279,7 @@ mod chained {
             if opt_v.is_none() {
                 fail fmt!("Key not found in table: %?", k);
             }
-            option::unwrap(opt_v)
+            option::unwrap(move opt_v)
         }
 
         fn remove(+k: K) -> bool {
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 77333130cf5..a6357c9fbb7 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -275,7 +275,7 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
                         result::Err(GetAddrUnknownError));
                     break;
                 };
-                out_vec += ~[new_ip_addr];
+                out_vec += ~[move new_ip_addr];
 
                 let next_addr = ll::get_next_addrinfo(curr_addr);
                 if next_addr == ptr::null::<addrinfo>() as *addrinfo {
@@ -289,7 +289,7 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
             }
             log(debug, fmt!("successful process addrinfo result, len: %?",
                             vec::len(out_vec)));
-            (*handle_data).output_ch.send(result::Ok(out_vec));
+            (*handle_data).output_ch.send(result::Ok(move out_vec));
         }
         else {
             log(debug, ~"addrinfo pointer is NULL");
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index 9bf893b0961..d4eb5ce6998 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -155,7 +155,7 @@ fn connect(-input_ip: ip::IpAddr, port: uint,
     // we can send into the interact cb to be handled in libuv..
     log(debug, fmt!("stream_handle_ptr outside interact %?",
         stream_handle_ptr));
-    do iotask::interact(iotask) |loop_ptr| unsafe {
+    do iotask::interact(iotask) |move input_ip, loop_ptr| unsafe {
         log(debug, ~"in interact cb for tcp client connect..");
         log(debug, fmt!("stream_handle_ptr in interact %?",
             stream_handle_ptr));
@@ -575,7 +575,7 @@ fn listen(-host_ip: ip::IpAddr, port: uint, backlog: uint,
           +new_connect_cb: fn~(TcpNewConnection,
                                comm::Chan<Option<TcpErrData>>))
     -> result::Result<(), TcpListenErrData> unsafe {
-    do listen_common(host_ip, port, backlog, iotask, on_establish_cb)
+    do listen_common(move host_ip, port, backlog, iotask, on_establish_cb)
         // on_connect_cb
         |move new_connect_cb, handle| unsafe {
             let server_data_ptr = uv::ll::get_data_for_uv_handle(handle)
@@ -600,7 +600,7 @@ fn listen_common(-host_ip: ip::IpAddr, port: uint, backlog: uint,
         server_stream_ptr: server_stream_ptr,
         stream_closed_ch: core::comm::Chan(stream_closed_po),
         kill_ch: kill_ch,
-        on_connect_cb: on_connect_cb,
+        on_connect_cb: move on_connect_cb,
         iotask: iotask,
         mut active: true
     };
@@ -614,7 +614,7 @@ fn listen_common(-host_ip: ip::IpAddr, port: uint, backlog: uint,
         // tcp::connect (because the iotask::interact cb isn't
         // nested within a core::comm::listen block)
         let loc_ip = copy(host_ip);
-        do iotask::interact(iotask) |loop_ptr| unsafe {
+        do iotask::interact(iotask) |move loc_ip, loop_ptr| unsafe {
             match uv::ll::tcp_init(loop_ptr, server_stream_ptr) {
               0i32 => {
                 uv::ll::set_data_for_uv_handle(
@@ -739,7 +739,7 @@ impl TcpSocket {
     fn read_stop(-read_port:
                  comm::Port<result::Result<~[u8], TcpErrData>>) ->
         result::Result<(), TcpErrData> {
-        read_stop(self, read_port)
+        read_stop(self, move read_port)
     }
     fn read(timeout_msecs: uint) ->
         result::Result<~[u8], TcpErrData> {
@@ -1491,7 +1491,8 @@ mod test {
                           cont_ch: comm::Chan<()>,
                           iotask: IoTask) -> ~str {
         let server_ip_addr = ip::v4::parse_addr(server_ip);
-        let listen_result = listen(server_ip_addr, server_port, 128u, iotask,
+        let listen_result = listen(move server_ip_addr, server_port, 128,
+                                   iotask,
             // on_establish_cb -- called when listener is set up
             |kill_ch| {
                 log(debug, fmt!("establish_cb %?",
@@ -1574,7 +1575,8 @@ mod test {
     fn run_tcp_test_server_fail(server_ip: ~str, server_port: uint,
                           iotask: IoTask) -> TcpListenErrData {
         let server_ip_addr = ip::v4::parse_addr(server_ip);
-        let listen_result = listen(server_ip_addr, server_port, 128u, iotask,
+        let listen_result = listen(move server_ip_addr, server_port, 128,
+                                   iotask,
             // on_establish_cb -- called when listener is set up
             |kill_ch| {
                 log(debug, fmt!("establish_cb %?",
@@ -1600,7 +1602,8 @@ mod test {
         let server_ip_addr = ip::v4::parse_addr(server_ip);
 
         log(debug, ~"CLIENT: starting..");
-        let connect_result = connect(server_ip_addr, server_port, iotask);
+        let connect_result = connect(move server_ip_addr, server_port,
+                                     iotask);
         if result::is_err(connect_result) {
             log(debug, ~"CLIENT: failed to connect");
             let err_data = result::get_err(connect_result);
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index d1dc6cb8d02..4e7eaeccf9d 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -814,11 +814,11 @@ mod node {
                     offset += 1u;
                     i      += 1u;
                 }
-                unsafe::forget(local_buf);
+                unsafe::forget(move local_buf);
               }
             }
         }
-        return unsafe::transmute(buf);
+        return unsafe::transmute(move buf);
     }
 
     /**
diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs
index e9f937f4d75..f7cdfd60f50 100644
--- a/src/libstd/sha1.rs
+++ b/src/libstd/sha1.rs
@@ -253,7 +253,7 @@ fn sha1() -> Sha1 {
         mut computed: false,
         work_buf: @vec::to_mut(vec::from_elem(work_buf_len, 0u32))
     };
-    let sh <- st as Sha1;
+    let sh = (move st) as Sha1;
     sh.reset();
     return sh;
 }
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index 6719b8ad6cd..9a176013474 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -108,7 +108,7 @@ impl<Q: Send> &Sem<Q> {
         /* for 1000.times { task::yield(); } */
         // Need to wait outside the exclusive.
         if waiter_nobe.is_some() {
-            let _ = pipes::recv_one(option::unwrap(waiter_nobe));
+            let _ = pipes::recv_one(option::unwrap(move waiter_nobe));
         }
     }
     fn release() {
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index 7c0e87ec144..b1f03f713d8 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -401,7 +401,7 @@ fn run_test(+test: TestDesc, monitor_ch: comm::Chan<MonitorMsg>) {
         task::task().unlinked().future_result(|+r| {
             result_future = Some(move r);
         }).spawn(move testfn);
-        let task_result = future::get(&option::unwrap(result_future));
+        let task_result = future::get(&option::unwrap(move result_future));
         let test_result = calc_result(test, task_result == task::Success);
         comm::send(monitor_ch, (copy test, test_result));
     };
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index e5af0e8ffdf..34f5c28ba95 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -104,7 +104,7 @@ fn spawn_loop() -> IoTask {
             }
         }
     };
-    spawn_iotask(builder)
+    spawn_iotask(move builder)
 }
 
 #[cfg(test)]