about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJacob Kiesel <jacob.kiesel@vivint.com>2020-10-12 15:09:45 -0600
committerJacob Kiesel <jacob.kiesel@vivint.com>2020-10-12 15:09:45 -0600
commita7d33684481ac114802bc57c44a2acb10c361ccb (patch)
tree2e4934385ea6ed5ff5bcb2b512149537e21b4913
parentd6b5ffb5b41579dbc49e651691fa9bb670a39a07 (diff)
downloadrust-a7d33684481ac114802bc57c44a2acb10c361ccb.tar.gz
rust-a7d33684481ac114802bc57c44a2acb10c361ccb.zip
Stabilize clamp
-rw-r--r--library/core/src/cmp.rs4
-rw-r--r--library/std/src/f32.rs3
-rw-r--r--library/std/src/f64.rs3
-rw-r--r--library/std/src/lib.rs1
4 files changed, 3 insertions, 8 deletions
diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs
index ee79a94cc66..f2ebe0c41c3 100644
--- a/library/core/src/cmp.rs
+++ b/library/core/src/cmp.rs
@@ -631,14 +631,12 @@ pub trait Ord: Eq + PartialOrd<Self> {
     /// # Examples
     ///
     /// ```
-    /// #![feature(clamp)]
-    ///
     /// assert!((-3).clamp(-2, 1) == -2);
     /// assert!(0.clamp(-2, 1) == 0);
     /// assert!(2.clamp(-2, 1) == 1);
     /// ```
     #[must_use]
-    #[unstable(feature = "clamp", issue = "44095")]
+    #[stable(feature = "clamp", since = "1.49.0")]
     fn clamp(self, min: Self, max: Self) -> Self
     where
         Self: Sized,
diff --git a/library/std/src/f32.rs b/library/std/src/f32.rs
index 59c2da5273b..63afc7ad089 100644
--- a/library/std/src/f32.rs
+++ b/library/std/src/f32.rs
@@ -891,14 +891,13 @@ impl f32 {
     /// # Examples
     ///
     /// ```
-    /// #![feature(clamp)]
     /// assert!((-3.0f32).clamp(-2.0, 1.0) == -2.0);
     /// assert!((0.0f32).clamp(-2.0, 1.0) == 0.0);
     /// assert!((2.0f32).clamp(-2.0, 1.0) == 1.0);
     /// assert!((f32::NAN).clamp(-2.0, 1.0).is_nan());
     /// ```
     #[must_use = "method returns a new number and does not mutate the original value"]
-    #[unstable(feature = "clamp", issue = "44095")]
+    #[stable(feature = "clamp", since = "1.49.0")]
     #[inline]
     pub fn clamp(self, min: f32, max: f32) -> f32 {
         assert!(min <= max);
diff --git a/library/std/src/f64.rs b/library/std/src/f64.rs
index bd094bdb55d..bb2a6c87f50 100644
--- a/library/std/src/f64.rs
+++ b/library/std/src/f64.rs
@@ -893,14 +893,13 @@ impl f64 {
     /// # Examples
     ///
     /// ```
-    /// #![feature(clamp)]
     /// assert!((-3.0f64).clamp(-2.0, 1.0) == -2.0);
     /// assert!((0.0f64).clamp(-2.0, 1.0) == 0.0);
     /// assert!((2.0f64).clamp(-2.0, 1.0) == 1.0);
     /// assert!((f64::NAN).clamp(-2.0, 1.0).is_nan());
     /// ```
     #[must_use = "method returns a new number and does not mutate the original value"]
-    #[unstable(feature = "clamp", issue = "44095")]
+    #[stable(feature = "clamp", since = "1.49.0")]
     #[inline]
     pub fn clamp(self, min: f64, max: f64) -> f64 {
         assert!(min <= max);
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 5224672adb2..49e1f34e3b8 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -234,7 +234,6 @@
 #![feature(cfg_target_thread_local)]
 #![feature(char_error_internals)]
 #![feature(char_internals)]
-#![feature(clamp)]
 #![feature(concat_idents)]
 #![feature(const_cstr_unchecked)]
 #![feature(const_fn_floating_point_arithmetic)]