---

yaml
---
r: 13723
b: refs/heads/master
c: d4672a0
h: refs/heads/master
i:
  13721: 3d89f90
  13719: f1b3d4c
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ccd2394ff9ccff11950d0830aaeb74f4fabb7d9c
+refs/heads/master: d4672a078e62ca4c28e459fa541886b5b180cc9a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/net_tcp.rs

@@ -6,6 +6,7 @@ import ip = net_ip;
 import uv::iotask;
 import uv::iotask::iotask;
 import comm::methods;
+import future_spawn = future::spawn;
 import future::future;
 import result::{result,err,ok,extensions};
 
@@ -248,9 +249,9 @@ A `future` value that, once the `write` operation completes, resolves to a
 value as the `err` variant
 "]
 fn write_future(sock: tcp_socket, raw_write_data: [u8]/~)
-    -> future::future<result::result<(), tcp_err_data>> unsafe {
+    -> future<result::result<(), tcp_err_data>> unsafe {
     let socket_data_ptr = ptr::addr_of(*(sock.socket_data));
-    future::spawn {||
+    future_spawn {||
         write_common_impl(socket_data_ptr, raw_write_data)
     }
 }
@@ -337,9 +338,9 @@ Otherwise, use the blocking `tcp::read` function instead.
 read attempt. Pass `0u` to wait indefinitely
 "]
 fn read_future(sock: tcp_socket, timeout_msecs: uint)
-    -> future::future<result::result<[u8]/~,tcp_err_data>> {
+    -> future<result::result<[u8]/~,tcp_err_data>> {
     let socket_data = ptr::addr_of(*(sock.socket_data));
-    future::spawn {||
+    future_spawn {||
         read_common_impl(socket_data, timeout_msecs)
     }
 }
@@ -802,15 +803,15 @@ impl sock_methods for tcp_socket {
         read(self, timeout_msecs)
     }
     fn read_future(timeout_msecs: uint) ->
-        future::future<result::result<[u8]/~, tcp_err_data>> {
+        future<result::result<[u8]/~, tcp_err_data>> {
         read_future(self, timeout_msecs)
     }
     fn write(raw_write_data: [u8]/~)
         -> result::result<(), tcp_err_data> {
         write(self, raw_write_data)
     }
     fn write_future(raw_write_data: [u8]/~)
-        -> future::future<result::result<(), tcp_err_data>> {
+        -> future<result::result<(), tcp_err_data>> {
         write_future(self, raw_write_data)
     }
 }

trunk/src/libstd/par.rs

@@ -2,6 +2,7 @@ import comm::port;
 import comm::chan;
 import comm::send;
 import comm::recv;
+import future_spawn = future::spawn;
 import future::future;
 
 export map, mapi, alli, any, mapi_factory;
@@ -42,7 +43,7 @@ fn map_slices<A: copy send, B: copy send>(
             // FIXME: why is the ::<A, ()> annotation required here? (#2617)
             vec::unpack_slice::<A, ()>(xs) {|p, _len|
                 let f = f();
-                let f = future::spawn() {|copy base|
+                let f = future_spawn() {|copy base|
                     unsafe {
                         let len = end - base;
                         let slice = (ptr::offset(p, base),