diff options
| author | bors <bors@rust-lang.org> | 2023-05-12 07:31:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-12 07:31:18 +0000 |
| commit | 0b795044c6f0854445f1f2bb6443e87848e150d1 (patch) | |
| tree | a2842ede93534dda9077eb39a4ffc7e82c6cf16a /compiler/rustc_errors/src | |
| parent | 699a862a3d4e4a2d5603c93297c0c44021ea72f5 (diff) | |
| parent | 9039de61f392016c5043b720ca218d3561af7efe (diff) | |
| download | rust-0b795044c6f0854445f1f2bb6443e87848e150d1.tar.gz rust-0b795044c6f0854445f1f2bb6443e87848e150d1.zip | |
Auto merge of #111493 - matthiaskrgr:rollup-iw1z59b, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #111179 (Fix instrument-coverage tests by using Python to sort instantiation groups) - #111393 (bump windows crate 0.46 -> 0.48) - #111441 (Verify copies of mutable pointers in 2 stages in ReferencePropagation) - #111456 (Update cargo) - #111490 (Don't ICE in layout computation for placeholder types) - #111492 (use by ref TokenTree iterator to avoid a few clones) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lock.rs | 3 |
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); |