diff --git a/library/core/src/convert/num.rs b/library/core/src/convert/num.rs index 50616732b7776..020d09b56e9fa 100644 --- a/library/core/src/convert/num.rs +++ b/library/core/src/convert/num.rs @@ -184,8 +184,7 @@ impl_from!(u32 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0 // impl_from!(u64 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0")]); // float -> float -// FIXME(f16_f128): adding additional `From<{float}>` impls to `f32` breaks inference. See -// +impl_from!(f16 => f32, #[stable(feature = "lossless_float_conv", since = "1.6.0")]); impl_from!(f16 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]); impl_from!(f16 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0")]); impl_from!(f32 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]); diff --git a/tests/ui/inference/untyped-primitives.rs b/tests/ui/inference/untyped-primitives.rs deleted file mode 100644 index 8515ca79903fc..0000000000000 --- a/tests/ui/inference/untyped-primitives.rs +++ /dev/null @@ -1,9 +0,0 @@ -//@ check-pass -// issue: rust-lang/rust#123824 -// This test is a sanity check and does not enforce any stable API, so may be -// removed at a future point. - -fn main() { - let x = f32::from(3.14); - let y = f64::from(3.14); -}