diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-05-12 07:11:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 07:11:12 +0200 |
| commit | d075b6c16dc86a026f6ef0b653c6cd386f82cc8b (patch) | |
| tree | 0fb2bfdc0e649de042ca5af1bb401d80a336db48 /compiler/rustc_data_structures/src | |
| parent | ea332b593780509a114ffe03c4a772f5eb54c5c7 (diff) | |
| parent | 4f12412a7d6afe81a14a2b49731c09dca25f1e37 (diff) | |
| download | rust-d075b6c16dc86a026f6ef0b653c6cd386f82cc8b.tar.gz rust-d075b6c16dc86a026f6ef0b653c6cd386f82cc8b.zip | |
Rollup merge of #111393 - klensy:win-0.48, r=oli-obk
bump windows crate 0.46 -> 0.48 This drops duped version of crate(0.46), reduces `rustc_driver.dll` ~800kb and reduces exported functions number from 26k to 22k. Also while here, added `tidy-alphabetical` sorting to lists in tidy allowed lists.
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/profiling.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/profiling.rs b/compiler/rustc_data_structures/src/profiling.rs index 5e13e7c8aaf..3c76c2b7991 100644 --- a/compiler/rustc_data_structures/src/profiling.rs +++ b/compiler/rustc_data_structures/src/profiling.rs @@ -865,14 +865,16 @@ cfg_if! { use std::mem; use windows::{ - Win32::System::ProcessStatus::{K32GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS}, + // 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::Threading::GetCurrentProcess, }; let mut pmc = PROCESS_MEMORY_COUNTERS::default(); let pmc_size = mem::size_of_val(&pmc); unsafe { - K32GetProcessMemoryInfo( + GetProcessMemoryInfo( GetCurrentProcess(), &mut pmc, pmc_size as u32, |