Skip to content

Commit 588cc02

Browse files
committed
Auto merge of rust-lang#123846 - matthiaskrgr:rollup-85y28av, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#123796 (Remove unused cargo-platform dependency from tidy) - rust-lang#123830 (Remove `From` impls for unstable types that break inference) - rust-lang#123842 (fix typo in pin.rs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 60b1256 + e6af2ad commit 588cc02

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/convert/num.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ impl_from!(u16 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0"
165165
impl_from!(u32 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
166166

167167
// float -> float
168-
impl_from!(f16 => f32, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
169-
impl_from!(f16 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
168+
// FIXME(f16_f128): adding additional `From` impls for existing types breaks inference. See
169+
// <https://github.com/rust-lang/rust/issues/123824>
170170
impl_from!(f16 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
171171
impl_from!(f32 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
172172
impl_from!(f32 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);

core/src/pin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ impl<Ptr: Deref<Target: Unpin>> Pin<Ptr> {
11981198
/// Unwraps this `Pin<Ptr>`, returning the underlying pointer.
11991199
///
12001200
/// Doing this operation safely requires that the data pointed at by this pinning pointer
1201-
/// implemts [`Unpin`] so that we can ignore the pinning invariants when unwrapping it.
1201+
/// implements [`Unpin`] so that we can ignore the pinning invariants when unwrapping it.
12021202
///
12031203
/// # Examples
12041204
///

0 commit comments

Comments
 (0)