about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2015-01-31 15:08:25 -0800
committerSteven Fackler <sfackler@gmail.com>2015-03-09 10:14:21 -0700
commite2605b42c7ce37717118fe240f7d0e8c4eae3598 (patch)
tree29aa2b8718f77fa3e1c04a60e0c8187e021768a7 /src/libstd/sync
parent2574009af0ff70dc233beab246db8f2d715be2cb (diff)
downloadrust-e2605b42c7ce37717118fe240f7d0e8c4eae3598.tar.gz
rust-e2605b42c7ce37717118fe240f7d0e8c4eae3598.zip
Rename #[should_fail] to #[should_panic]
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/condvar.rs2
-rw-r--r--src/libstd/sync/future.rs2
-rw-r--r--src/libstd/sync/task_pool.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs
index e7ee9bd2066..3499675f542 100644
--- a/src/libstd/sync/condvar.rs
+++ b/src/libstd/sync/condvar.rs
@@ -479,7 +479,7 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn two_mutexes() {
         static M1: StaticMutex = MUTEX_INIT;
         static M2: StaticMutex = MUTEX_INIT;
diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs
index d60e2738808..ee9bcd3dd89 100644
--- a/src/libstd/sync/future.rs
+++ b/src/libstd/sync/future.rs
@@ -204,7 +204,7 @@ mod test {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_future_panic() {
         let mut f = Future::spawn(move|| panic!());
         let _x: String = f.get();
diff --git a/src/libstd/sync/task_pool.rs b/src/libstd/sync/task_pool.rs
index efb6689e785..e41bc6d8683 100644
--- a/src/libstd/sync/task_pool.rs
+++ b/src/libstd/sync/task_pool.rs
@@ -164,7 +164,7 @@ mod test {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_zero_tasks_panic() {
         TaskPool::new(0);
     }