diff options
| author | klensy <klensy@users.noreply.github.com> | 2024-02-18 16:02:16 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2024-02-18 16:02:16 +0300 |
| commit | 35fe26757adce8cd8d1b9e7f4107a0ac9a7ab27b (patch) | |
| tree | 6158c398cd952051703bfdb2b39da1f80721d3a5 /compiler/rustc_data_structures | |
| parent | 5e2a7ac47a817b598aec3848efa8e674beebbcbf (diff) | |
| download | rust-35fe26757adce8cd8d1b9e7f4107a0ac9a7ab27b.tar.gz rust-35fe26757adce8cd8d1b9e7f4107a0ac9a7ab27b.zip | |
windows bump to 0.52
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/Cargo.toml | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/flock/windows.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/profiling.rs | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 0635d8552ae..80b6e72e49b 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -33,7 +33,7 @@ tracing = "0.1" version = "0.12" [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +version = "0.52.0" features = [ "Win32_Foundation", "Win32_Storage_FileSystem", diff --git a/compiler/rustc_data_structures/src/flock/windows.rs b/compiler/rustc_data_structures/src/flock/windows.rs index da128f464a6..9be1065135a 100644 --- a/compiler/rustc_data_structures/src/flock/windows.rs +++ b/compiler/rustc_data_structures/src/flock/windows.rs @@ -69,7 +69,6 @@ impl Lock { &mut overlapped, ) } - .ok() .map_err(|e| { let err = io::Error::from_raw_os_error(e.code().0); debug!("failed acquiring file lock: {}", err); diff --git a/compiler/rustc_data_structures/src/profiling.rs b/compiler/rustc_data_structures/src/profiling.rs index e29d4811980..2569684df3f 100644 --- a/compiler/rustc_data_structures/src/profiling.rs +++ b/compiler/rustc_data_structures/src/profiling.rs @@ -866,16 +866,14 @@ cfg_match! { use std::mem; use windows::{ - // FIXME: change back to K32GetProcessMemoryInfo when windows crate - // updated to 0.49.0+ to drop dependency on psapi.dll - Win32::System::ProcessStatus::{GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS}, + Win32::System::ProcessStatus::{K32GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS}, Win32::System::Threading::GetCurrentProcess, }; let mut pmc = PROCESS_MEMORY_COUNTERS::default(); let pmc_size = mem::size_of_val(&pmc); unsafe { - GetProcessMemoryInfo( + K32GetProcessMemoryInfo( GetCurrentProcess(), &mut pmc, pmc_size as u32, |