diff options
Diffstat (limited to 'src/libstd/sync.rs')
| -rw-r--r-- | src/libstd/sync.rs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 6c8d719e5f5..d143c665d83 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -588,7 +588,7 @@ pub impl RWlock { do task::unkillable { let mut first_reader = false; do self.state.with |state| { - assert !state.read_mode; + fail_unless!(!state.read_mode); state.read_mode = true; first_reader = (state.read_count == 0); state.read_count += 1; @@ -618,8 +618,8 @@ impl Drop for RWlockReleaseRead/&self { do task::unkillable { let mut last_reader = false; do self.lock.state.with |state| { - assert state.read_mode; - assert state.read_count > 0; + fail_unless!(state.read_mode); + fail_unless!(state.read_count > 0); state.read_count -= 1; if state.read_count == 0 { last_reader = true; @@ -653,7 +653,7 @@ impl Drop for RWlockReleaseDowngrade/&self { let mut writer_or_last_reader = false; do self.lock.state.with |state| { if state.read_mode { - assert state.read_count > 0; + fail_unless!(state.read_count > 0); state.read_count -= 1; if state.read_count == 0 { // Case 1: Writer downgraded & was the last reader @@ -839,7 +839,7 @@ mod tests { access_shared(sharedstate, m, 10); let _ = p.recv(); - assert *sharedstate == 20; + fail_unless!(*sharedstate == 20); fn access_shared(sharedstate: &mut int, m: &Mutex, n: uint) { for n.times { @@ -861,7 +861,7 @@ mod tests { do task::spawn || { do m2.lock_cond |cond| { let woken = cond.signal(); - assert woken; + fail_unless!(woken); } } cond.wait(); @@ -879,7 +879,7 @@ mod tests { let _ = port.recv(); // Wait until child gets in the mutex do m.lock_cond |cond| { let woken = cond.signal(); - assert woken; + fail_unless!(woken); } let _ = port.recv(); // Wait until child wakes up } @@ -905,7 +905,7 @@ mod tests { for ports.each |port| { let _ = port.recv(); } do m.lock_cond |cond| { let num_woken = cond.broadcast(); - assert num_woken == num_waiters; + fail_unless!(num_woken == num_waiters); } // wait until all children wake up for ports.each |port| { let _ = port.recv(); } @@ -926,7 +926,7 @@ mod tests { do m.lock_cond |_x| { } }; do m2.lock_cond |cond| { - assert !cond.signal(); + fail_unless!(!cond.signal()); } } #[test] #[ignore(cfg(windows))] @@ -940,7 +940,7 @@ mod tests { fail!(); } }; - assert result.is_err(); + fail_unless!(result.is_err()); // child task must have finished by the time try returns do m.lock { } } @@ -963,11 +963,11 @@ mod tests { cond.wait(); // block forever } }; - assert result.is_err(); + fail_unless!(result.is_err()); // child task must have finished by the time try returns do m.lock_cond |cond| { let woken = cond.signal(); - assert !woken; + fail_unless!(!woken); } } #[test] #[ignore(cfg(windows))] @@ -1000,12 +1000,12 @@ mod tests { c.send(sibling_convos); // let parent wait on all children fail!(); }; - assert result.is_err(); + fail_unless!(result.is_err()); // child task must have finished by the time try returns for vec::each(p.recv()) |p| { p.recv(); } // wait on all its siblings do m.lock_cond |cond| { let woken = cond.broadcast(); - assert woken == 0; + fail_unless!(woken == 0); } struct SendOnFailure { c: comm::Chan<()>, @@ -1056,7 +1056,7 @@ mod tests { } } }; - assert result.is_err(); + fail_unless!(result.is_err()); } #[test] #[ignore(cfg(windows))] pub fn test_mutex_no_condvars() { @@ -1064,17 +1064,17 @@ mod tests { let m = ~mutex_with_condvars(0); do m.lock_cond |cond| { cond.wait(); } }; - assert result.is_err(); + fail_unless!(result.is_err()); let result = do task::try { let m = ~mutex_with_condvars(0); do m.lock_cond |cond| { cond.signal(); } }; - assert result.is_err(); + fail_unless!(result.is_err()); let result = do task::try { let m = ~mutex_with_condvars(0); do m.lock_cond |cond| { cond.broadcast(); } }; - assert result.is_err(); + fail_unless!(result.is_err()); } /************************************************************************ * Reader/writer lock tests @@ -1116,7 +1116,7 @@ mod tests { access_shared(sharedstate, x, mode2, 10); let _ = p.recv(); - assert *sharedstate == 20; + fail_unless!(*sharedstate == 20); fn access_shared(sharedstate: &mut int, x: &RWlock, mode: RWlockMode, n: uint) { @@ -1210,7 +1210,7 @@ mod tests { do task::spawn || { do x2.write_cond |cond| { let woken = cond.signal(); - assert woken; + fail_unless!(woken); } } cond.wait(); @@ -1229,7 +1229,7 @@ mod tests { do x.read { } // Must be able to get in as a reader in the meantime do x.write_cond |cond| { // Or as another writer let woken = cond.signal(); - assert woken; + fail_unless!(woken); } let _ = port.recv(); // Wait until child wakes up do x.read { } // Just for good measure @@ -1268,7 +1268,7 @@ mod tests { for ports.each |port| { let _ = port.recv(); } do lock_cond(x, dg2) |cond| { let num_woken = cond.broadcast(); - assert num_woken == num_waiters; + fail_unless!(num_woken == num_waiters); } // wait until all children wake up for ports.each |port| { let _ = port.recv(); } @@ -1295,7 +1295,7 @@ mod tests { fail!(); } }; - assert result.is_err(); + fail_unless!(result.is_err()); // child task must have finished by the time try returns do lock_rwlock_in_mode(x, mode2) { } } |