about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-27 10:07:48 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-27 10:07:48 -0700
commit55c398d651e6b3e4f469325a35e029059ce36f1e (patch)
tree23da6bac0134a2989b539e57b0f50c48c6619775 /src/libstd/thread
parent88c3a0f423ea99be1e835b0dc24d3dcd5306a307 (diff)
parent3752958e4029e9d9cfb1ff020e92142b53fb810f (diff)
downloadrust-55c398d651e6b3e4f469325a35e029059ce36f1e.tar.gz
rust-55c398d651e6b3e4f469325a35e029059ce36f1e.zip
rollup merge of #23752: alexcrichton/remove-should-fail
This attribute has been deprecated in favor of #[should_panic]. This also
updates rustdoc to no longer accept the `should_fail` directive and instead
renames it to `should_panic`.
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index f086191e82c..074030bd07b 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -870,13 +870,13 @@ mod test {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_scoped_panic() {
         thread::scoped(|| panic!()).join();
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_scoped_implicit_panic() {
         let _ = thread::scoped(|| panic!());
     }