diff options
| author | Ralf Jung <post@ralfj.de> | 2023-05-12 10:02:12 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-05-12 10:02:12 +0200 |
| commit | 154c7a5e91ff9ebf8ab08d8f7db30ed2070e56a5 (patch) | |
| tree | d3d8993e7fca57a6930649c863d6f6b37c86a3bf /compiler/rustc_errors | |
| parent | 01937562505363962cf7a5c45a81d82cfe79dd4f (diff) | |
| parent | 0b795044c6f0854445f1f2bb6443e87848e150d1 (diff) | |
| download | rust-154c7a5e91ff9ebf8ab08d8f7db30ed2070e56a5.tar.gz rust-154c7a5e91ff9ebf8ab08d8f7db30ed2070e56a5.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/Cargo.toml | 3 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/lock.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml index 46ace8eb2dd..bd3033fcb3e 100644 --- a/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml @@ -27,12 +27,11 @@ serde = { version = "1.0.125", features = [ "derive" ] } serde_json = "1.0.59" [target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" +version = "0.48.0" features = [ "Win32_Foundation", "Win32_Security", "Win32_System_Threading", - "Win32_System_WindowsProgramming", ] [features] diff --git a/compiler/rustc_errors/src/lock.rs b/compiler/rustc_errors/src/lock.rs index 7db262abfde..bd5cf49b56b 100644 --- a/compiler/rustc_errors/src/lock.rs +++ b/compiler/rustc_errors/src/lock.rs @@ -19,8 +19,7 @@ pub fn acquire_global_lock(name: &str) -> Box<dyn Any> { use windows::{ core::PCSTR, Win32::Foundation::{CloseHandle, HANDLE, WAIT_ABANDONED, WAIT_OBJECT_0}, - Win32::System::Threading::{CreateMutexA, ReleaseMutex, WaitForSingleObject}, - Win32::System::WindowsProgramming::INFINITE, + Win32::System::Threading::{CreateMutexA, ReleaseMutex, WaitForSingleObject, INFINITE}, }; struct Handle(HANDLE); |