diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-18 09:41:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 09:41:38 -0600 |
| commit | dc6606ead91b147630c6644afcbddf7ea9806808 (patch) | |
| tree | 8882aaafa2beb020f823f42544c6f3a36baf75fb /src/libstd | |
| parent | 21a7b26bb42d85b19b59c44484136fa5d9258e2a (diff) | |
| parent | ffefc9aa1ca6383f722ec1cbf722da42ffdb8108 (diff) | |
| download | rust-dc6606ead91b147630c6644afcbddf7ea9806808.tar.gz rust-dc6606ead91b147630c6644afcbddf7ea9806808.zip | |
Rollup merge of #43315 - est31:stabilize_float_bits_conv, r=alexcrichton
float_bits_conv made it into 1.20 It seems that my PR to stabilize the `float_bits_conv` feature got merged before beta branched, which means I'm lucky, and the stabilization makes it into Rust 1.20. As it was against my expectations, the version number has to be corrected from 1.21 to 1.20. Please also apply this PR to the beta branch.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/f32.rs | 4 | ||||
| -rw-r--r-- | src/libstd/f64.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs index 9bacfee0553..0135cd0a588 100644 --- a/src/libstd/f32.rs +++ b/src/libstd/f32.rs @@ -1094,7 +1094,7 @@ impl f32 { /// assert_eq!((12.5f32).to_bits(), 0x41480000); /// /// ``` - #[stable(feature = "float_bits_conv", since = "1.21.0")] + #[stable(feature = "float_bits_conv", since = "1.20.0")] #[inline] pub fn to_bits(self) -> u32 { unsafe { ::mem::transmute(self) } @@ -1125,7 +1125,7 @@ impl f32 { /// let snan = 0x7F800001; /// assert_ne!(f32::from_bits(snan).to_bits(), snan); /// ``` - #[stable(feature = "float_bits_conv", since = "1.21.0")] + #[stable(feature = "float_bits_conv", since = "1.20.0")] #[inline] pub fn from_bits(mut v: u32) -> Self { const EXP_MASK: u32 = 0x7F800000; diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs index 5236048ade4..d73d7cd2c7b 100644 --- a/src/libstd/f64.rs +++ b/src/libstd/f64.rs @@ -1009,7 +1009,7 @@ impl f64 { /// assert_eq!((12.5f64).to_bits(), 0x4029000000000000); /// /// ``` - #[stable(feature = "float_bits_conv", since = "1.21.0")] + #[stable(feature = "float_bits_conv", since = "1.20.0")] #[inline] pub fn to_bits(self) -> u64 { unsafe { ::mem::transmute(self) } @@ -1040,7 +1040,7 @@ impl f64 { /// let snan = 0x7FF0000000000001; /// assert_ne!(f64::from_bits(snan).to_bits(), snan); /// ``` - #[stable(feature = "float_bits_conv", since = "1.21.0")] + #[stable(feature = "float_bits_conv", since = "1.20.0")] #[inline] pub fn from_bits(mut v: u64) -> Self { const EXP_MASK: u64 = 0x7FF0000000000000; |