diff options
Diffstat (limited to 'src/libextra')
| -rw-r--r-- | src/libextra/sync.rs | 8 | ||||
| -rw-r--r-- | src/libextra/test.rs | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs index 131cf063d1d..1988da2b0ba 100644 --- a/src/libextra/sync.rs +++ b/src/libextra/sync.rs @@ -918,7 +918,7 @@ mod tests { let m = Mutex::new(); let m2 = m.clone(); - let result: result::Result<(),()> = do task::try { + let result: result::Result<(), ~Any> = do task::try { do m2.lock { fail!(); } @@ -935,7 +935,7 @@ mod tests { let m = Mutex::new(); let m2 = m.clone(); - let result: result::Result<(),()> = do task::try { + let result: result::Result<(), ~Any> = do task::try { let (p, c) = comm::stream(); do task::spawn || { // linked let _ = p.recv(); // wait for sibling to get in the mutex @@ -963,7 +963,7 @@ mod tests { let m2 = m.clone(); let (p, c) = comm::stream(); - let result: result::Result<(),()> = do task::try { + let result: result::Result<(), ~Any> = do task::try { let mut sibling_convos = ~[]; do 2.times { let (p, c) = comm::stream(); @@ -1272,7 +1272,7 @@ mod tests { let x = RWLock::new(); let x2 = x.clone(); - let result: result::Result<(),()> = do task::try || { + let result: result::Result<(), ~Any> = do task::try || { do lock_rwlock_in_mode(&x2, mode1) { fail!(); } diff --git a/src/libextra/test.rs b/src/libextra/test.rs index 457f7868e23..070108ddf2e 100644 --- a/src/libextra/test.rs +++ b/src/libextra/test.rs @@ -873,8 +873,7 @@ pub fn run_test(force_ignore: bool, task.spawn(testfn_cell.take()); let task_result = result_future.recv(); - let test_result = calc_result(&desc, - task_result == task::Success); + let test_result = calc_result(&desc, task_result.is_ok()); monitor_ch.send((desc.clone(), test_result)); } } |