about summary refs log tree commit diff
path: root/src/libstd/sync.rs
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@mozilla.com>2013-01-15 17:18:00 -0800
committerNick Desaulniers <ndesaulniers@mozilla.com>2013-01-15 17:18:00 -0800
commitbb7d7204e26e862881c0e59edf3fc26be1bbec05 (patch)
treef25420d15d6bbf81ae424d3ab31e68df7de21367 /src/libstd/sync.rs
parenteb8fd119c65c67f3b1b8268cc7341c22d39b7b61 (diff)
downloadrust-bb7d7204e26e862881c0e59edf3fc26be1bbec05.tar.gz
rust-bb7d7204e26e862881c0e59edf3fc26be1bbec05.zip
Swap return value order in pipes::oneshot Issue #4496
Diffstat (limited to 'src/libstd/sync.rs')
-rw-r--r--src/libstd/sync.rs4
1 files changed, 2 insertions, 2 deletions
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;