Skip to content

Commit 4f124de

Browse files
authored
Rollup merge of rust-lang#131289 - RalfJung:duration_consts_float, r=tgross35
stabilize duration_consts_float Waiting for FCP in rust-lang#72440 to pass. `as_millis_f32` and `as_millis_f64` are not stable at all yet, so I moved their const-stability together with their regular stability (tracked at rust-lang#122451). Fixes rust-lang#72440
2 parents de76914 + 12b8028 commit 4f124de

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
#![feature(const_unicode_case_lookup)]
154154
#![feature(coverage_attribute)]
155155
#![feature(do_not_recommend)]
156-
#![feature(duration_consts_float)]
157156
#![feature(internal_impls_macro)]
158157
#![feature(ip)]
159158
#![feature(is_ascii_octdigit)]

core/src/time.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ impl Duration {
847847
#[stable(feature = "duration_float", since = "1.38.0")]
848848
#[must_use]
849849
#[inline]
850-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
850+
#[rustc_const_stable(feature = "duration_consts_float", since = "CURRENT_RUSTC_VERSION")]
851851
pub const fn as_secs_f64(&self) -> f64 {
852852
(self.secs as f64) + (self.nanos.0 as f64) / (NANOS_PER_SEC as f64)
853853
}
@@ -866,7 +866,7 @@ impl Duration {
866866
#[stable(feature = "duration_float", since = "1.38.0")]
867867
#[must_use]
868868
#[inline]
869-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
869+
#[rustc_const_stable(feature = "duration_consts_float", since = "CURRENT_RUSTC_VERSION")]
870870
pub const fn as_secs_f32(&self) -> f32 {
871871
(self.secs as f32) + (self.nanos.0 as f32) / (NANOS_PER_SEC as f32)
872872
}
@@ -886,7 +886,7 @@ impl Duration {
886886
#[unstable(feature = "duration_millis_float", issue = "122451")]
887887
#[must_use]
888888
#[inline]
889-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
889+
#[rustc_const_unstable(feature = "duration_millis_float", issue = "122451")]
890890
pub const fn as_millis_f64(&self) -> f64 {
891891
(self.secs as f64) * (MILLIS_PER_SEC as f64)
892892
+ (self.nanos.0 as f64) / (NANOS_PER_MILLI as f64)
@@ -907,7 +907,7 @@ impl Duration {
907907
#[unstable(feature = "duration_millis_float", issue = "122451")]
908908
#[must_use]
909909
#[inline]
910-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
910+
#[rustc_const_unstable(feature = "duration_millis_float", issue = "122451")]
911911
pub const fn as_millis_f32(&self) -> f32 {
912912
(self.secs as f32) * (MILLIS_PER_SEC as f32)
913913
+ (self.nanos.0 as f32) / (NANOS_PER_MILLI as f32)
@@ -1087,7 +1087,7 @@ impl Duration {
10871087
#[must_use = "this returns the result of the operation, \
10881088
without modifying the original"]
10891089
#[inline]
1090-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
1090+
#[rustc_const_stable(feature = "duration_consts_float", since = "CURRENT_RUSTC_VERSION")]
10911091
pub const fn div_duration_f64(self, rhs: Duration) -> f64 {
10921092
let self_nanos = (self.secs as f64) * (NANOS_PER_SEC as f64) + (self.nanos.0 as f64);
10931093
let rhs_nanos = (rhs.secs as f64) * (NANOS_PER_SEC as f64) + (rhs.nanos.0 as f64);
@@ -1108,7 +1108,7 @@ impl Duration {
11081108
#[must_use = "this returns the result of the operation, \
11091109
without modifying the original"]
11101110
#[inline]
1111-
#[rustc_const_unstable(feature = "duration_consts_float", issue = "72440")]
1111+
#[rustc_const_stable(feature = "duration_consts_float", since = "CURRENT_RUSTC_VERSION")]
11121112
pub const fn div_duration_f32(self, rhs: Duration) -> f32 {
11131113
let self_nanos = (self.secs as f32) * (NANOS_PER_SEC as f32) + (self.nanos.0 as f32);
11141114
let rhs_nanos = (rhs.secs as f32) * (NANOS_PER_SEC as f32) + (rhs.nanos.0 as f32);

core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#![feature(dec2flt)]
3939
#![feature(duration_constants)]
4040
#![feature(duration_constructors)]
41-
#![feature(duration_consts_float)]
4241
#![feature(error_generic_member_access)]
4342
#![feature(exact_size_is_empty)]
4443
#![feature(extern_types)]

0 commit comments

Comments
 (0)