diff options
| author | bors <bors@rust-lang.org> | 2021-04-12 05:44:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-12 05:44:25 +0000 |
| commit | d68f7a2f50958d632ef8dc79212481e4f183ed36 (patch) | |
| tree | a6e30dac0fb7e04cf48b65cd9083ecec6430bc03 | |
| parent | 2c56db4e129501f7dbe8f2abff01c8f31b4189b4 (diff) | |
| parent | 7d8914838582b0f04167979c415e918f1b63659a (diff) | |
| download | rust-d68f7a2f50958d632ef8dc79212481e4f183ed36.tar.gz rust-d68f7a2f50958d632ef8dc79212481e4f183ed36.zip | |
Auto merge of #84090 - marmeladema:stabilize-duration-saturating-ops, r=m-ou-se
Stabilize feature `duration_saturating_ops` FCP here: https://github.com/rust-lang/rust/issues/76416#issuecomment-817201314 Closes #76416 r? `@m-ou-se`
| -rw-r--r-- | library/core/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/core/src/time.rs | 9 | ||||
| -rw-r--r-- | library/core/tests/lib.rs | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 760b8d8cbb0..06c5014f2f3 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -112,7 +112,6 @@ #![cfg_attr(bootstrap, feature(doc_spotlight))] #![cfg_attr(not(bootstrap), feature(doc_notable_trait))] #![feature(duration_consts_2)] -#![feature(duration_saturating_ops)] #![feature(extended_key_value_attributes)] #![feature(extern_types)] #![feature(fundamental)] diff --git a/library/core/src/time.rs b/library/core/src/time.rs index 8c0848c64aa..2219353b055 100644 --- a/library/core/src/time.rs +++ b/library/core/src/time.rs @@ -479,14 +479,13 @@ impl Duration { /// # Examples /// /// ``` - /// #![feature(duration_saturating_ops)] /// #![feature(duration_constants)] /// use std::time::Duration; /// /// assert_eq!(Duration::new(0, 0).saturating_add(Duration::new(0, 1)), Duration::new(0, 1)); /// assert_eq!(Duration::new(1, 0).saturating_add(Duration::new(u64::MAX, 0)), Duration::MAX); /// ``` - #[unstable(feature = "duration_saturating_ops", issue = "76416")] + #[stable(feature = "duration_saturating_ops", since = "1.53.0")] #[inline] #[rustc_const_unstable(feature = "duration_consts_2", issue = "72440")] pub const fn saturating_add(self, rhs: Duration) -> Duration { @@ -537,14 +536,13 @@ impl Duration { /// # Examples /// /// ``` - /// #![feature(duration_saturating_ops)] /// #![feature(duration_zero)] /// use std::time::Duration; /// /// assert_eq!(Duration::new(0, 1).saturating_sub(Duration::new(0, 0)), Duration::new(0, 1)); /// assert_eq!(Duration::new(0, 0).saturating_sub(Duration::new(0, 1)), Duration::ZERO); /// ``` - #[unstable(feature = "duration_saturating_ops", issue = "76416")] + #[stable(feature = "duration_saturating_ops", since = "1.53.0")] #[inline] #[rustc_const_unstable(feature = "duration_consts_2", issue = "72440")] pub const fn saturating_sub(self, rhs: Duration) -> Duration { @@ -590,14 +588,13 @@ impl Duration { /// # Examples /// /// ``` - /// #![feature(duration_saturating_ops)] /// #![feature(duration_constants)] /// use std::time::Duration; /// /// assert_eq!(Duration::new(0, 500_000_001).saturating_mul(2), Duration::new(1, 2)); /// assert_eq!(Duration::new(u64::MAX - 1, 0).saturating_mul(2), Duration::MAX); /// ``` - #[unstable(feature = "duration_saturating_ops", issue = "76416")] + #[stable(feature = "duration_saturating_ops", since = "1.53.0")] #[inline] #[rustc_const_unstable(feature = "duration_consts_2", issue = "72440")] pub const fn saturating_mul(self, rhs: u32) -> Duration { diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 6624fd47353..3e5e5f32609 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -24,7 +24,6 @@ #![feature(div_duration)] #![feature(duration_consts_2)] #![feature(duration_constants)] -#![feature(duration_saturating_ops)] #![feature(duration_zero)] #![feature(exact_size_is_empty)] #![feature(extern_types)] |
