---

yaml
---
r: 24522
b: refs/heads/try2
c: 1c2843c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d52f0f79bcfd86b689d88a2edfcdb4aafac2e8af
+refs/heads/try2: 1c2843c8adb670570c6a18a06a5d1473b17afffb
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/future.rs

@@ -14,6 +14,7 @@ io::println(#fmt(\"fib(5000) = %?\", delayed_fib.get()))
 import either::either;
 
 export future;
+export extensions;
 export from_value;
 export from_port;
 export from_fn;
@@ -27,7 +28,7 @@ enum future<A> = {
 };
 
 #[doc = "Methods on the `future` type"]
-impl future<A:copy send> for future<A> {
+impl extensions<A:copy send> for future<A> {
 
     fn get() -> A {
         #[doc = "Get the value of the future"];

branches/try2/src/libstd/net_tcp.rs

@@ -6,8 +6,8 @@ import ip = net_ip;
 import uv::iotask;
 import uv::iotask::iotask;
 import comm::methods;
-import future::future;
 import future_spawn = future::spawn;
+import future::extensions;
 // FIXME #1935
 // should be able to, but can't atm, replace w/ result::{result, extensions};
 import result::*;
@@ -303,7 +303,7 @@ 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<result::result<(), tcp_err_data>> unsafe {
+    -> future::future<result::result<(), tcp_err_data>> unsafe {
     let socket_data_ptr = ptr::addr_of(*(sock.socket_data));
     do future_spawn || {
         let data_copy = copy(raw_write_data);
@@ -395,7 +395,7 @@ 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<result::result<~[u8],tcp_err_data>> {
+    -> future::future<result::result<~[u8],tcp_err_data>> {
     let socket_data = ptr::addr_of(*(sock.socket_data));
     do future_spawn || {
         read_common_impl(socket_data, timeout_msecs)

branches/try2/src/libstd/par.rs

@@ -3,7 +3,7 @@ import comm::chan;
 import comm::send;
 import comm::recv;
 import future_spawn = future::spawn;
-import future::future;
+import future::extensions;
 import core::vec::extensions;
 
 export map, mapi, alli, any, mapi_factory;