---

yaml
---
r: 55935
b: refs/heads/master
c: 39693e7
h: refs/heads/master
i:
  55933: 4f81361
  55931: 12b5067
  55927: 310db66
  55919: fcb8388
  55903: 0113982
  55871: 46b1519
  55807: f9800c5
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 37abf4bad0eda08cf4ef756310443329fa28f6cf
+refs/heads/master: 39693e7b61c4ff3ea5a62fcc662e8ee9340c7d4f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/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]

trunk/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)
     }

trunk/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");