about summary refs log tree commit diff
path: root/compiler/rustc_errors/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-05-12 08:34:41 +0000
committerbors <bors@rust-lang.org>2023-05-12 08:34:41 +0000
commit81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc (patch)
tree268db993456f8d37af3aee2a1ecea11f5f57cc5c /compiler/rustc_errors/src
parent44de0ee5c85d79693f6ae36c994b612ac2f79096 (diff)
parent97d3e4eba6401bbf88cdd3b0de5d58559da82120 (diff)
downloadrust-81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc.tar.gz
rust-81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc.zip
Auto merge of #2891 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'compiler/rustc_errors/src')
-rw-r--r--compiler/rustc_errors/src/lock.rs3
1 files changed, 1 insertions, 2 deletions
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);