---

yaml
---
r: 31604
b: refs/heads/dist-snap
c: f76a462
h: refs/heads/master
v: v3

Author: eholk

[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: 1d04b0ed5ac829594a412298cb9f9455d1a4d843
+refs/heads/dist-snap: f76a46242b6a34ac09643ddf4050be9d1ad11573
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/test/bench/shootout-pfib.rs

@@ -15,33 +15,33 @@ use std;
 import std::{time, getopts};
 import io::writer_util;
 import int::range;
-import comm::port;
-import comm::chan;
-import comm::send;
-import comm::recv;
+import pipes::port;
+import pipes::chan;
+import pipes::send;
+import pipes::recv;
 
 import core::result;
 import result::{ok, err};
 
 fn fib(n: int) -> int {
     fn pfib(c: chan<int>, n: int) {
         if n == 0 {
-            send(c, 0);
+            c.send(0);
         } else if n <= 2 {
-            send(c, 1);
+            c.send(1);
         } else {
-            let p = port();
-            let ch = chan(p);
+            let p = pipes::port_set();
+            let ch = p.chan();
             task::spawn(|| pfib(ch, n - 1) );
+            let ch = p.chan();
             task::spawn(|| pfib(ch, n - 2) );
-            send(c, recv(p) + recv(p));
+            c.send(p.recv() + p.recv());
         }
     }
 
-    let p = port();
-    let ch = chan(p);
+    let (ch, p) = pipes::stream();
     let t = task::spawn(|| pfib(ch, n) );
-    return recv(p);
+    p.recv()
 }
 
 type config = {stress: bool};