about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorJacob Kiesel <kieseljake@gmail.com>2017-09-08 16:07:21 -0600
committerJacob Kiesel <kieseljake@gmail.com>2017-09-08 16:07:21 -0600
commitdb5b5f97063bd12cb5fb857e33cc5b417b408ef8 (patch)
tree786ef0a77030c1d27e16ece0cd8a7b7e57e2cc60 /src/libstd
parent63f4dab0f5049bda995d043ac6c1bdd05a9865e6 (diff)
downloadrust-db5b5f97063bd12cb5fb857e33cc5b417b408ef8.tar.gz
rust-db5b5f97063bd12cb5fb857e33cc5b417b408ef8.zip
Revert "Add clamp functions"
This reverts commit c589f867f89d4e6e48c6602aed8e878208d4822f.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/f32.rs20
-rw-r--r--src/libstd/f64.rs20
2 files changed, 0 insertions, 40 deletions
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs
index 18bc27faa82..0135cd0a588 100644
--- a/src/libstd/f32.rs
+++ b/src/libstd/f32.rs
@@ -1080,26 +1080,6 @@ impl f32 {
         0.5 * ((2.0 * self) / (1.0 - self)).ln_1p()
     }
 
-    /// Returns max if self is greater than max, and min if self is less than min.
-    /// Otherwise this returns self.  Panics if min > max, min equals NaN, or max equals NaN.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// assert!((-3.0f32).clamp(-2.0f32, 1.0f32) == -2.0f32);
-    /// assert!((0.0f32).clamp(-2.0f32, 1.0f32) == 0.0f32);
-    /// assert!((2.0f32).clamp(-2.0f32, 1.0f32) == 1.0f32);
-    /// ```
-    #[unstable(feature = "clamp", issue = "44095")]
-    #[inline]
-    pub fn clamp(self, min: f32, max: f32) -> f32 {
-        assert!(min <= max);
-        let mut x = self;
-        if x < min { x = min; }
-        if x > max { x = max; }
-        x
-    }
-
     /// Raw transmutation to `u32`.
     ///
     /// Converts the `f32` into its raw memory representation,
diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs
index b04ba9eabdb..d73d7cd2c7b 100644
--- a/src/libstd/f64.rs
+++ b/src/libstd/f64.rs
@@ -970,26 +970,6 @@ impl f64 {
         0.5 * ((2.0 * self) / (1.0 - self)).ln_1p()
     }
 
-    /// Returns max if self is greater than max, and min if self is less than min.
-    /// Otherwise this returns self.  Panics if min > max, min equals NaN, or max equals NaN.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// assert!((-3.0f64).clamp(-2.0f64, 1.0f64) == -2.0f64);
-    /// assert!((0.0f64).clamp(-2.0f64, 1.0f64) == 0.0f64);
-    /// assert!((2.0f64).clamp(-2.0f64, 1.0f64) == 1.0f64);
-    /// ```
-    #[unstable(feature = "clamp", issue = "44095")]
-    #[inline]
-    pub fn clamp(self, min: f64, max: f64) -> f64 {
-        assert!(min <= max);
-        let mut x = self;
-        if x < min { x = min; }
-        if x > max { x = max; }
-        x
-    }
-
     // Solaris/Illumos requires a wrapper around log, log2, and log10 functions
     // because of their non-standard behavior (e.g. log(-n) returns -Inf instead
     // of expected NaN).