Auto merge of #21824 - sfackler:should_panic, r=alexcrichton

6 files changed, 8 insertions, 8 deletions

diff --git a/src/libcoretest/cell.rs b/src/libcoretest/cell.rs
index 317ef3a5701..3397cbb18fa 100644
--- a/src/libcoretest/cell.rs
+++ b/src/libcoretest/cell.rs
@@ -109,7 +109,7 @@ fn double_borrow_single_release_no_borrow_mut() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn discard_doesnt_unborrow() {
     let x = RefCell::new(0);
     let _b = x.borrow();
diff --git a/src/libcoretest/finally.rs b/src/libcoretest/finally.rs
index 55fcb849851..2a48395271d 100644
--- a/src/libcoretest/finally.rs
+++ b/src/libcoretest/finally.rs
@@ -30,7 +30,7 @@ fn test_success() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn test_fail() {
     let mut i = 0;
     try_finally(
diff --git a/src/libcoretest/fmt/num.rs b/src/libcoretest/fmt/num.rs
index bc3995439a0..7db8db444ff 100644
--- a/src/libcoretest/fmt/num.rs
+++ b/src/libcoretest/fmt/num.rs
@@ -161,7 +161,7 @@ fn test_format_radix() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn test_radix_base_too_large() {
     let _ = radix(55, 37);
 }
diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs
index 91d1ea27476..0f4e7fcdda5 100644
--- a/src/libcoretest/iter.rs
+++ b/src/libcoretest/iter.rs
@@ -581,7 +581,7 @@ fn test_rposition() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn test_rposition_panic() {
     let v: [(Box<_>, Box<_>); 4] =
         [(box 0, box 0), (box 0, box 0),
diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs
index 59116f23d44..fe0b10e9119 100644
--- a/src/libcoretest/option.rs
+++ b/src/libcoretest/option.rs
@@ -80,7 +80,7 @@ fn test_option_dance() {
     assert!(y.is_none());
 }
 
-#[test] #[should_fail]
+#[test] #[should_panic]
 fn test_option_too_much_dance() {
     let mut y = Some(marker::NoCopy);
     let _y2 = y.take().unwrap();
@@ -139,14 +139,14 @@ fn test_unwrap() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn test_unwrap_panic1() {
     let x: Option<int> = None;
     x.unwrap();
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 fn test_unwrap_panic2() {
     let x: Option<String> = None;
     x.unwrap();
diff --git a/src/libcoretest/result.rs b/src/libcoretest/result.rs
index 10cc3ad6424..1c175ba99f7 100644
--- a/src/libcoretest/result.rs
+++ b/src/libcoretest/result.rs
@@ -126,7 +126,7 @@ pub fn test_unwrap_or_else() {
 }
 
 #[test]
-#[should_fail]
+#[should_panic]
 pub fn test_unwrap_or_else_panic() {
     fn handler(msg: &'static str) -> int {
         if msg == "I got this." {