---

yaml
---
r: 20869
b: refs/heads/snap-stage3
c: 618d311
h: refs/heads/master
i:
  20867: 7cdf198
v: v3

Author: eholk

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5012abde8f05b00a71b1e0546c687c8cd4bc7318
+refs/heads/snap-stage3: 618d311c3d9a1790c8063a0ee853b3786954cc61
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -8,6 +8,11 @@ import task;
 import core::result;
 import result::{ok, err};
 
+import comm::port;
+import comm::chan;
+import comm::send;
+import comm::recv;
+
 import common::config;
 import common::mode_run_pass;
 import common::mode_run_fail;

branches/snap-stage3/src/compiletest/procsrv.rs

@@ -2,8 +2,6 @@ import run::spawn_process;
 import io::{writer_util, reader_util};
 import libc::{c_int, pid_t};
 
-import pipes::chan;
-
 export run;
 
 #[cfg(target_os = "win32")]
@@ -60,30 +58,29 @@ fn run(lib_path: ~str,
 
 
     writeclose(pipe_in.out, input);
-    let p = pipes::port_set();
-    let ch = p.chan();
+    let p = comm::port();
+    let ch = comm::chan(p);
     do task::spawn_sched(task::single_threaded) {
         let errput = readclose(pipe_err.in);
-        ch.send((2, errput));
+        comm::send(ch, (2, errput));
     }
-    let ch = p.chan();
     do task::spawn_sched(task::single_threaded) {
         let output = readclose(pipe_out.in);
-        ch.send((1, output));
+        comm::send(ch, (1, output));
     }
     let status = run::waitpid(pid);
     let mut errs = ~"";
     let mut outs = ~"";
     let mut count = 2;
     while count > 0 {
-        alt p.recv() {
-          (1, s) {
-            outs = s;
-          }
-          (2, s) {
-            errs = s;
-          }
-          _ { fail }
+        let stream = comm::recv(p);
+        alt check stream {
+            (1, s) {
+                outs = s;
+            }
+            (2, s) {
+                errs = s;
+            }
         };
         count -= 1;
     };