diff options
| author | bors <bors@rust-lang.org> | 2023-09-04 08:04:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-04 08:04:00 +0000 |
| commit | ce798a52c30528366764a5993783b4e9ccfa46ee (patch) | |
| tree | 8c56f3780a40bff94caa6458f4790ff5d94290a1 | |
| parent | b14b0745ad4913a21f00795738c047d0107dff4a (diff) | |
| parent | 56df6b81898efcdf4d486eb9baa16e1273f3c08e (diff) | |
| download | rust-ce798a52c30528366764a5993783b4e9ccfa46ee.tar.gz rust-ce798a52c30528366764a5993783b4e9ccfa46ee.zip | |
Auto merge of #115493 - Ayush1325:raw-os-error, r=workingjubilee
Move RawOsError defination to sys This was originally a part of https://github.com/rust-lang/rust/pull/105861, but I feel it should be its own PR since the raw os error is still unstable.
| -rw-r--r-- | library/std/src/io/error.rs | 2 | ||||
| -rw-r--r-- | library/std/src/io/error/repr_bitpacked.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/library/std/src/io/error.rs b/library/std/src/io/error.rs index d6fce4ee78f..ea10bb8636c 100644 --- a/library/std/src/io/error.rs +++ b/library/std/src/io/error.rs @@ -102,7 +102,7 @@ enum ErrorData<C> { /// /// [`into`]: Into::into #[unstable(feature = "raw_os_error_ty", issue = "107792")] -pub type RawOsError = i32; +pub type RawOsError = sys::RawOsError; // `#[repr(align(4))]` is probably redundant, it should have that value or // higher already. We include it just because repr_bitpacked.rs's encoding diff --git a/library/std/src/io/error/repr_bitpacked.rs b/library/std/src/io/error/repr_bitpacked.rs index f94f88bac41..6e7366b3635 100644 --- a/library/std/src/io/error/repr_bitpacked.rs +++ b/library/std/src/io/error/repr_bitpacked.rs @@ -374,9 +374,6 @@ static_assert!((TAG_MASK + 1).is_power_of_two()); static_assert!(align_of::<SimpleMessage>() >= TAG_MASK + 1); static_assert!(align_of::<Custom>() >= TAG_MASK + 1); -// `RawOsError` must be an alias for `i32`. -const _: fn(RawOsError) -> i32 = |os| os; - static_assert!(@usize_eq: TAG_MASK & TAG_SIMPLE_MESSAGE, TAG_SIMPLE_MESSAGE); static_assert!(@usize_eq: TAG_MASK & TAG_CUSTOM, TAG_CUSTOM); static_assert!(@usize_eq: TAG_MASK & TAG_OS, TAG_OS); diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index beea3f23c2d..63bd783746b 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -110,3 +110,5 @@ pub fn log_wrapper<F: Fn(f64) -> f64>(n: f64, log_fn: F) -> f64 { pub fn log_wrapper<F: Fn(f64) -> f64>(n: f64, log_fn: F) -> f64 { log_fn(n) } + +pub type RawOsError = i32; |