mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #123846 - matthiaskrgr:rollup-85y28av, r=matthiaskrgr

Browse Source 
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
This commit is contained in:
bors 2024-04-12 13:13:50 +00:00
commit bd71213cf0
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock
View File

@ -5579,7 +5579,6 @@ dependencies = [
name = "tidy"
version = "0.1.0"
dependencies = [
"cargo-platform",
"cargo_metadata 0.15.4",
"ignore",
"lazy_static",

4
library/core/src/convert/num.rs
View File

@ -165,8 +165,8 @@ fn from(small: $Small) -> Self {
impl_from!(u32 => f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);
// float -> float
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")]);
// FIXME(f16_f128): adding additional `From` impls for existing types breaks inference. See
// <https://github.com/rust-lang/rust/issues/123824>
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")]);
impl_from!(f32 => f128, #[stable(feature = "lossless_float_conv", since = "1.6.0")]);

2
library/core/src/pin.rs
View File

@ -1198,7 +1198,7 @@ pub const fn new(pointer: Ptr) -> Pin<Ptr> {
/// Unwraps this `Pin<Ptr>`, returning the underlying pointer.
///
/// Doing this operation safely requires that the data pointed at by this pinning pointer
/// implemts [`Unpin`] so that we can ignore the pinning invariants when unwrapping it.
/// implements [`Unpin`] so that we can ignore the pinning invariants when unwrapping it.
///
/// # Examples
///

1
src/tools/tidy/Cargo.toml
View File

@ -6,7 +6,6 @@ autobins = false
[dependencies]
cargo_metadata = "0.15"
cargo-platform = "0.1.2"
regex = "1"
miropt-test-tools = { path = "../miropt-test-tools" }
lazy_static = "1"

9
tests/ui/inference/untyped-primitives.rs Normal file
View File

@ -0,0 +1,9 @@
//@ 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);
}