about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-04-27 22:05:39 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-04-29 14:30:57 -0700
commit39693e7b61c4ff3ea5a62fcc662e8ee9340c7d4f (patch)
tree725da0fc70355cd71104236d5ab882bda4467cc7
parent37abf4bad0eda08cf4ef756310443329fa28f6cf (diff)
downloadrust-39693e7b61c4ff3ea5a62fcc662e8ee9340c7d4f.tar.gz
rust-39693e7b61c4ff3ea5a62fcc662e8ee9340c7d4f.zip
test: Fix more tests.
-rw-r--r--src/libcore/comm.rs6
-rw-r--r--src/libcore/pipes.rs4
-rw-r--r--src/libstd/future.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 522eebaf327..50a3bba049b 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -565,11 +565,11 @@ mod test {
 
     #[test]
     fn test_oneshot() {
-        let (c, p) = oneshot::init();
+        let (p, c) = oneshot();
 
-        oneshot::client::send(c, ());
+        c.send(());
 
-        recv_one(p)
+        p.recv()
     }
 
     #[test]
diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs
index 7364e50cc04..95b24d20a4b 100644
--- a/src/libcore/pipes.rs
+++ b/src/libcore/pipes.rs
@@ -885,9 +885,9 @@ mod test {
 
     #[test]
     fn test_oneshot() {
-        let (c, p) = oneshot::init();
+        let (p, c) = oneshot();
 
-        oneshot::client::send(c, ());
+        c.send(());
 
         recv_one(p)
     }
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index c6c593d7b4a..f59abfa81ca 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -185,7 +185,7 @@ mod test {
 
     #[test]
     fn test_from_port() {
-        let (ch, po) = oneshot();
+        let (po, ch) = oneshot();
         send_one(ch, ~"whale");
         let f = from_port(po);
         assert!(f.get() == ~"whale");