diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-01-30 16:57:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 16:57:48 +0100 |
| commit | 4f4ceefe161fef0f5d8785b26c5b3bf2c38b47f5 (patch) | |
| tree | af0075aab752c90e61fc068cc79b225dadb77190 /library/std/src/sys/pal/windows | |
| parent | 0a4fd52c916aa54272ed1be0c3f6ff8c6c4e0d80 (diff) | |
| parent | bf4de3a874753bbee3323081c8b0c133444fed2d (diff) | |
| download | rust-4f4ceefe161fef0f5d8785b26c5b3bf2c38b47f5.tar.gz rust-4f4ceefe161fef0f5d8785b26c5b3bf2c38b47f5.zip | |
Rollup merge of #120295 - reitermarkus:remove-ffi-nonzero, r=dtolnay
Remove `raw_os_nonzero` feature. This feature is superseded by a generic `NonZero` type: https://github.com/rust-lang/rust/issues/120257 Closes https://github.com/rust-lang/rust/issues/82363.
Diffstat (limited to 'library/std/src/sys/pal/windows')
| -rw-r--r-- | library/std/src/sys/pal/windows/c.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs index d55d9bace81..1a59ac9a9ca 100644 --- a/library/std/src/sys/pal/windows/c.rs +++ b/library/std/src/sys/pal/windows/c.rs @@ -7,17 +7,17 @@ use crate::ffi::CStr; use crate::mem; +use crate::num::NonZero; pub use crate::os::raw::c_int; use crate::os::raw::{c_char, c_long, c_longlong, c_uint, c_ulong, c_ushort, c_void}; use crate::os::windows::io::{AsRawHandle, BorrowedHandle}; use crate::ptr; -use core::ffi::NonZero_c_ulong; mod windows_sys; pub use windows_sys::*; pub type DWORD = c_ulong; -pub type NonZeroDWORD = NonZero_c_ulong; +pub type NonZeroDWORD = NonZero<c_ulong>; pub type LARGE_INTEGER = c_longlong; #[cfg_attr(target_vendor = "uwp", allow(unused))] pub type LONG = c_long; |