Cleaning up task and comm exports, updating all the test cases.

2 files changed, 12 insertions, 10 deletions

diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index e3122b283b1..033a3bc9ec2 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -5,13 +5,14 @@
 
 use std;
 import std::task;
-import std::comm::mk_port;
+import std::comm::port;
+import std::comm::recv;
 
 fn child() { assert (1 == 2); }
 
 fn main() {
-    let p = mk_port::<int>();
+    let p = port::<int>();
     let f = child;
-    task::_spawn(f);
-    let x = p.recv();
+    task::spawn(f);
+    let x = recv(p);
 }
diff --git a/src/test/run-fail/port-type.rs b/src/test/run-fail/port-type.rs
index 5954ba53065..65b15b56d72 100644
--- a/src/test/run-fail/port-type.rs
+++ b/src/test/run-fail/port-type.rs
@@ -1,16 +1,17 @@
 // error-pattern:meep
 use std;
-import std::comm::_chan;
-import std::comm::mk_port;
+import std::comm::chan;
+import std::comm::port;
 import std::comm::send;
+import std::comm::recv;
 
-fn echo<~T>(c: &_chan<T>, oc: &_chan<_chan<T>>) {
+fn echo<~T>(c: &chan<T>, oc: &chan<chan<T>>) {
     // Tests that the type argument in port gets
     // visited
-    let p = mk_port::<T>();
-    send(oc, p.mk_chan());
+    let p = port::<T>();
+    send(oc, chan(p));
 
-    let x = p.recv();
+    let x = recv(p);
     send(c, x);
 }