---

yaml
---
r: 36085
b: refs/heads/try2
c: 84c8549
h: refs/heads/master
i:
  36083: 9aeff31
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 50f9925fabbc738f7be0df8148c99fae3e975bb1
+refs/heads/try2: 84c85496227e1b31f763dfd7e9a82c9b5da52407
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/future.rs

@@ -17,7 +17,7 @@
  */
 
 use either::Either;
-use pipes::recv;
+use pipes::{recv, oneshot, ChanOne, PortOne, send_one, recv_one};
 use cast::copy_lifetime;
 
 #[doc = "The future type"]
@@ -67,7 +67,7 @@ pub fn from_value<A>(val: A) -> Future<A> {
     Future {state: Forced(~(move val))}
 }
 
-pub fn from_port<A:Send>(port: future_pipe::server::waiting<A>) ->
+pub fn from_port<A:Send>(port: PortOne<A>) ->
         Future<A> {
     /*!
      * Create a future from a port
@@ -82,7 +82,7 @@ pub fn from_port<A:Send>(port: future_pipe::server::waiting<A>) ->
         port_ <-> *port;
         let port = option::unwrap(move port_);
         match recv(move port) {
-            future_pipe::completed(move data) => move data
+            oneshot::send(move data) => move data
         }
     }
 }
@@ -107,12 +107,12 @@ pub fn spawn<A:Send>(blk: fn~() -> A) -> Future<A> {
      * value of the future.
      */
 
-    let (chan, port) = future_pipe::init();
+    let (chan, port) = oneshot::init();
 
     let chan = ~mut Some(move chan);
     do task::spawn |move blk, move chan| {
         let chan = option::swap_unwrap(&mut *chan);
-        future_pipe::client::completed(move chan, blk());
+        send_one(move chan, blk());
     }
 
     return from_port(move port);
@@ -168,12 +168,6 @@ pub fn with<A,B>(future: &Future<A>, blk: fn((&A)) -> B) -> B {
     blk(get_ref(future))
 }
 
-proto! future_pipe (
-    waiting:send<T:Send> {
-        completed(T) -> !
-    }
-)
-
 #[allow(non_implicitly_copyable_typarams)]
 pub mod test {
     #[test]
@@ -184,8 +178,8 @@ pub mod test {
 
     #[test]
     pub fn test_from_port() {
-        let (ch, po) = future_pipe::init();
-        future_pipe::client::completed(move ch, ~"whale");
+        let (ch, po) = oneshot::init();
+        send_one(move ch, ~"whale");
         let f = from_port(move po);
         assert get(&f) == ~"whale";
     }