Skip to content

Commit bd71213

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

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -5579,7 +5579,6 @@ dependencies = [
55795579
name = "tidy"
55805580
version = "0.1.0"
55815581
dependencies = [
5582-
"cargo-platform",
55835582
"cargo_metadata 0.15.4",
55845583
"ignore",
55855584
"lazy_static",

library/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")]);

library/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
///

src/tools/tidy/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ autobins = false
66

77
[dependencies]
88
cargo_metadata = "0.15"
9-
cargo-platform = "0.1.2"
109
regex = "1"
1110
miropt-test-tools = { path = "../miropt-test-tools" }
1211
lazy_static = "1"
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//@ check-pass
2+
// issue: rust-lang/rust#123824
3+
// This test is a sanity check and does not enforce any stable API, so may be
4+
// removed at a future point.
5+
6+
fn main() {
7+
let x = f32::from(3.14);
8+
let y = f64::from(3.14);
9+
}

0 commit comments

Comments
 (0)