Swap return value order in pipes::oneshot Issue #4496

2 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index 3463b31c55c..e48dc9acaeb 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -512,7 +512,7 @@ mod tests {
     fn test_mutex_arc_condvar() {
         let arc = ~MutexARC(false);
         let arc2 = ~arc.clone();
-        let (c,p) = pipes::oneshot();
+        let (p,c) = pipes::oneshot();
         let (c,p) = (~mut Some(move c), ~mut Some(move p));
         do task::spawn |move arc2, move p| {
             // wait until parent gets in
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index 58bdf8cfa74..f12114bfd8e 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -109,7 +109,7 @@ impl<Q: Owned> &Sem<Q> {
                 state.count -= 1;
                 if state.count < 0 {
                     // Create waiter nobe.
-                    let (SignalEnd, WaitEnd) = pipes::oneshot();
+                    let (WaitEnd, SignalEnd) = pipes::oneshot();
                     // Tell outer scope we need to block.
                     waiter_nobe = Some(move WaitEnd);
                     // Enqueue ourself.
@@ -216,7 +216,7 @@ impl &Condvar {
      */
     fn wait_on(condvar_id: uint) {
         // Create waiter nobe.
-        let (SignalEnd, WaitEnd) = pipes::oneshot();
+        let (WaitEnd, SignalEnd) = pipes::oneshot();
         let mut WaitEnd   = Some(move WaitEnd);
         let mut SignalEnd = Some(move SignalEnd);
         let mut reacquire = None;