mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-16 17:03:35 +00:00
Rollup merge of #117656 - ChrisDenton:invalid, r=thomcc
Update windows-bindgen and define `INVALID_HANDLE_VALUE` ourselves We generate bindings to the Windows API via the `windows-bindgen` crate, which is ultimately what's also used to generate the `windows-sys` and `windows` crates. However, there currently is some custom sauce just for std which makes it a bit different from the vanilla bindings. I would love for us to reduce and eventually remove the differences entirely so that std is using the exact same bindings as everyone else. Maybe in the future we can even just have a normal dependency on `windows-sys`. This PR removes one of those special things. Our definition of `INVALID_HANDLE_VALUE` relies on an experimental nightly feature for strict provenance, so lets bring that back in house. It also excludes it from the codegen step though that isn't strictly necessary as we override it in any case. This PR also updates windows-bingen to 0.52.0.
This commit is contained in:
commit
7e3ec1b0e2
@ -6072,9 +6072,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-bindgen"
|
||||
version = "0.51.1"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc1f16b778125675feee0d15d6dd9f6af0e3ac52b3233d63a10aa39230c1cd75"
|
||||
checksum = "970efb0b6849eb8a87a898f586af7cc167567b070014c7434514c0bde0ca341c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"rayon",
|
||||
@ -6084,9 +6084,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-metadata"
|
||||
version = "0.51.1"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "753135d996f9da437c0b31dbde3032489a61708361929bcc07d4fba0b161000e"
|
||||
checksum = "218fd59201e26acdbb894fa2b302d1de84bf3eec7d0eb894ac8e9c5a854ee4ef"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
|
@ -47,6 +47,8 @@ pub use FD_SET as fd_set;
|
||||
pub use LINGER as linger;
|
||||
pub use TIMEVAL as timeval;
|
||||
|
||||
pub const INVALID_HANDLE_VALUE: HANDLE = ::core::ptr::invalid_mut(-1i32 as _);
|
||||
|
||||
// https://learn.microsoft.com/en-us/cpp/c-runtime-library/exit-success-exit-failure?view=msvc-170
|
||||
pub const EXIT_SUCCESS: u32 = 0;
|
||||
pub const EXIT_FAILURE: u32 = 1;
|
||||
|
@ -2,6 +2,7 @@
|
||||
--config flatten std
|
||||
--filter
|
||||
// tidy-alphabetical-start
|
||||
!Windows.Win32.Foundation.INVALID_HANDLE_VALUE
|
||||
Windows.Wdk.Storage.FileSystem.FILE_COMPLETE_IF_OPLOCKED
|
||||
Windows.Wdk.Storage.FileSystem.FILE_CONTAINS_EXTENDED_CREATE_INFORMATION
|
||||
Windows.Wdk.Storage.FileSystem.FILE_CREATE
|
||||
@ -1923,7 +1924,6 @@ Windows.Win32.Foundation.HANDLE_FLAG_INHERIT
|
||||
Windows.Win32.Foundation.HANDLE_FLAG_PROTECT_FROM_CLOSE
|
||||
Windows.Win32.Foundation.HANDLE_FLAGS
|
||||
Windows.Win32.Foundation.HMODULE
|
||||
Windows.Win32.Foundation.INVALID_HANDLE_VALUE
|
||||
Windows.Win32.Foundation.MAX_PATH
|
||||
Windows.Win32.Foundation.NO_ERROR
|
||||
Windows.Win32.Foundation.NTSTATUS
|
||||
@ -2483,7 +2483,6 @@ Windows.Win32.System.SystemInformation.GetSystemTimeAsFileTime
|
||||
Windows.Win32.System.SystemInformation.GetWindowsDirectoryW
|
||||
Windows.Win32.System.SystemInformation.PROCESSOR_ARCHITECTURE
|
||||
Windows.Win32.System.SystemInformation.SYSTEM_INFO
|
||||
Windows.Win32.System.SystemServices.ALL_PROCESSOR_GROUPS
|
||||
Windows.Win32.System.SystemServices.DLL_PROCESS_DETACH
|
||||
Windows.Win32.System.SystemServices.DLL_THREAD_DETACH
|
||||
Windows.Win32.System.SystemServices.EXCEPTION_MAXIMUM_PARAMETERS
|
||||
@ -2492,6 +2491,7 @@ Windows.Win32.System.SystemServices.IO_REPARSE_TAG_SYMLINK
|
||||
Windows.Win32.System.Threading.ABOVE_NORMAL_PRIORITY_CLASS
|
||||
Windows.Win32.System.Threading.AcquireSRWLockExclusive
|
||||
Windows.Win32.System.Threading.AcquireSRWLockShared
|
||||
Windows.Win32.System.Threading.ALL_PROCESSOR_GROUPS
|
||||
Windows.Win32.System.Threading.BELOW_NORMAL_PRIORITY_CLASS
|
||||
Windows.Win32.System.Threading.CREATE_BREAKAWAY_FROM_JOB
|
||||
Windows.Win32.System.Threading.CREATE_DEFAULT_ERROR_MODE
|
||||
|
@ -4,7 +4,7 @@
|
||||
// regenerate the bindings.
|
||||
//
|
||||
// ignore-tidy-filelength
|
||||
// Bindings generated by `windows-bindgen` 0.51.1
|
||||
// Bindings generated by `windows-bindgen` 0.52.0
|
||||
|
||||
#![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
|
||||
#[link(name = "advapi32")]
|
||||
@ -63,7 +63,7 @@ extern "system" {
|
||||
lpnewfilename: PCWSTR,
|
||||
lpprogressroutine: LPPROGRESS_ROUTINE,
|
||||
lpdata: *const ::core::ffi::c_void,
|
||||
pbcancel: *mut i32,
|
||||
pbcancel: *mut BOOL,
|
||||
dwcopyflags: u32,
|
||||
) -> BOOL;
|
||||
}
|
||||
@ -619,7 +619,7 @@ extern "system" {
|
||||
lpmultibytestr: PSTR,
|
||||
cbmultibyte: i32,
|
||||
lpdefaultchar: PCSTR,
|
||||
lpuseddefaultchar: *mut i32,
|
||||
lpuseddefaultchar: *mut BOOL,
|
||||
) -> i32;
|
||||
}
|
||||
#[link(name = "kernel32")]
|
||||
@ -869,7 +869,7 @@ pub const AF_INET: ADDRESS_FAMILY = 2u16;
|
||||
pub const AF_INET6: ADDRESS_FAMILY = 23u16;
|
||||
pub const AF_UNIX: u16 = 1u16;
|
||||
pub const AF_UNSPEC: ADDRESS_FAMILY = 0u16;
|
||||
pub const ALL_PROCESSOR_GROUPS: u32 = 65535u32;
|
||||
pub const ALL_PROCESSOR_GROUPS: u16 = 65535u16;
|
||||
#[repr(C)]
|
||||
pub union ARM64_NT_NEON128 {
|
||||
pub Anonymous: ARM64_NT_NEON128_0,
|
||||
@ -3498,7 +3498,6 @@ impl ::core::clone::Clone for INIT_ONCE {
|
||||
}
|
||||
pub const INIT_ONCE_INIT_FAILED: u32 = 4u32;
|
||||
pub const INVALID_FILE_ATTRIBUTES: u32 = 4294967295u32;
|
||||
pub const INVALID_HANDLE_VALUE: HANDLE = ::core::ptr::invalid_mut(-1i32 as _);
|
||||
pub const INVALID_SOCKET: SOCKET = -1i32 as _;
|
||||
#[repr(C)]
|
||||
pub struct IN_ADDR {
|
||||
|
@ -4,4 +4,4 @@ version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies.windows-bindgen]
|
||||
version = "0.51.1"
|
||||
version = "0.52.0"
|
||||
|
Loading…
Reference in New Issue
Block a user