---

yaml
---
r: 32482
b: refs/heads/dist-snap
c: 27129c6
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 6bdda1e0de6097c1647ac49da8b24e86dd5299b8
+refs/heads/dist-snap: 27129c6aba153299100887de5c8643cbe3e9b8ef
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/future.rs

@@ -37,7 +37,7 @@ struct Future<A> {
 }
 
 priv enum FutureState<A> {
-    Pending(fn@() -> A),
+    Pending(fn~() -> A),
     Evaluating,
     Forced(A)
 }
@@ -93,7 +93,7 @@ fn from_port<A:Send>(+port: future_pipe::client::waiting<A>) -> Future<A> {
     }
 }
 
-fn from_fn<A>(+f: @fn() -> A) -> Future<A> {
+fn from_fn<A>(+f: ~fn() -> A) -> Future<A> {
     /*!
      * Create a future from a function.
      *
@@ -239,4 +239,14 @@ mod test {
         let f = spawn(|| fail);
         let _x: ~str = get(&f);
     }
-}
+
+    #[test]
+    fn test_sendable_future() {
+        let expected = ~"schlorf";
+        let f = do spawn |copy expected| { expected };
+        do task::spawn {
+            let actual = get(&f);
+            assert actual == expected;
+        }
+    }
+}

branches/dist-snap/src/libcore/task.rs

@@ -1754,7 +1754,7 @@ fn test_spawn_linked_sup_fail_down() { // parent fails; child fails
         opts.supervised = true;
         move opts
     };
-    
+
     let b0 = task();
     let b1 = TaskBuilder({
         opts: move opts,

branches/dist-snap/src/rustdoc/markdown_writer.rs

@@ -285,15 +285,14 @@ fn future_writer_factory(
 }
 
 fn future_writer() -> (writer, future::Future<~str>) {
-    let port = comm::Port();
-    let chan = comm::Chan(port);
+    let (chan, port) = pipes::stream();
     let writer = fn~(+instr: writeinstr) {
-        comm::send(chan, copy instr);
+        chan.send(copy instr);
     };
     let future = do future::from_fn {
         let mut res = ~"";
         loop {
-            match comm::recv(port) {
+            match port.recv() {
               write(s) => res += s,
               done => break
             }