From 67283fa8e6ec6ffb1db782c6862d3bdec45cecf8 Mon Sep 17 00:00:00 2001
From: Jacob Kiesel <kieseljake@gmail.com>
Date: Fri, 8 Sep 2017 16:07:09 -0600
Subject: [PATCH] Revert "Add panic unit tests"

This reverts commit b762283e57ff71f6763effb9cfc7fc0c7967b6b0.
---
 src/libstd/f32.rs | 18 ------------------
 src/libstd/f64.rs | 18 ------------------
 src/libstd/lib.rs |  1 -
 3 files changed, 37 deletions(-)

diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs
index 69ca77f54b4..aaeac06535e 100644
--- a/src/libstd/f32.rs
+++ b/src/libstd/f32.rs
@@ -1777,22 +1777,4 @@ fn test_snan_masking() {
         assert_ne!(nan_masked & QNAN_MASK, 0);
         assert!(nan_masked_fl.is_nan());
     }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_greater_than_max() {
-        1.0f32.clamp(3.0, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_is_nan() {
-        1.0f32.clamp(NAN, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_max_is_nan() {
-        1.0f32.clamp(3.0, NAN);
-    }
 }
diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs
index 6ec633bfaaa..4ab319c3cf1 100644
--- a/src/libstd/f64.rs
+++ b/src/libstd/f64.rs
@@ -1668,22 +1668,4 @@ fn test_float_bits_conv() {
         assert_approx_eq!(f64::from_bits(0x4094e40000000000), 1337.0);
         assert_approx_eq!(f64::from_bits(0xc02c800000000000), -14.25);
     }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_greater_than_max() {
-        1.0f64.clamp(3.0, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_is_nan() {
-        1.0f64.clamp(NAN, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_max_is_nan() {
-        1.0f64.clamp(3.0, NAN);
-    }
 }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 191f7fe648e..cf1eb5cd52e 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -249,7 +249,6 @@
 #![feature(cfg_target_vendor)]
 #![feature(char_error_internals)]
 #![feature(char_internals)]
-#![feature(clamp)]
 #![feature(collections_range)]
 #![feature(compiler_builtins_lib)]
 #![feature(const_fn)]
-- 
2.44.0