---

yaml
---
r: 30418
b: refs/heads/incoming
c: 9ee7b31
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 2f32c0d5c34d0bd5c94b7905ebb2916ec94761e4
+refs/heads/incoming: 9ee7b31414fce48403daa19904a7097b9a77baea
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/sync.rs

@@ -96,11 +96,11 @@ impl<Q: Send> &Sem<Q> {
                 state.count -= 1;
                 if state.count < 0 {
                     // Create waiter nobe.
-                    let (signal_end, wait_end) = pipes::oneshot();
+                    let (SignalEnd, WaitEnd) = pipes::oneshot();
                     // Tell outer scope we need to block.
-                    waiter_nobe = Some(wait_end);
+                    waiter_nobe = Some(WaitEnd);
                     // Enqueue ourself.
-                    state.waiters.tail.send(signal_end);
+                    state.waiters.tail.send(SignalEnd);
                 }
             }
         }
@@ -202,9 +202,9 @@ impl &Condvar {
      */
     fn wait_on(condvar_id: uint) {
         // Create waiter nobe.
-        let (signal_end, wait_end) = pipes::oneshot();
-        let mut wait_end   = Some(wait_end);
-        let mut signal_end = Some(signal_end);
+        let (SignalEnd, WaitEnd) = pipes::oneshot();
+        let mut WaitEnd   = Some(WaitEnd);
+        let mut SignalEnd = Some(SignalEnd);
         let mut reacquire = None;
         let mut out_of_bounds = None;
         unsafe {
@@ -218,8 +218,8 @@ impl &Condvar {
                             signal_waitqueue(&state.waiters);
                         }
                         // Enqueue ourself to be woken up by a signaller.
-                        let signal_end = option::swap_unwrap(&mut signal_end);
-                        state.blocked[condvar_id].tail.send(signal_end);
+                        let SignalEnd = option::swap_unwrap(&mut SignalEnd);
+                        state.blocked[condvar_id].tail.send(SignalEnd);
                     } else {
                         out_of_bounds = Some(vec::len(state.blocked));
                     }
@@ -238,7 +238,7 @@ impl &Condvar {
             // Unconditionally "block". (Might not actually block if a
             // signaller already sent -- I mean 'unconditionally' in contrast
             // with acquire().)
-            let _ = pipes::recv_one(option::swap_unwrap(&mut wait_end));
+            let _ = pipes::recv_one(option::swap_unwrap(&mut WaitEnd));
         }
 
         // This is needed for a failing condition variable to reacquire the