diff options
| author | bors <bors@rust-lang.org> | 2023-05-12 08:34:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-12 08:34:41 +0000 |
| commit | 81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc (patch) | |
| tree | 268db993456f8d37af3aee2a1ecea11f5f57cc5c /compiler/rustc_data_structures/src | |
| parent | 44de0ee5c85d79693f6ae36c994b612ac2f79096 (diff) | |
| parent | 97d3e4eba6401bbf88cdd3b0de5d58559da82120 (diff) | |
| download | rust-81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc.tar.gz rust-81a4c1d58d7ecbb8870f723b09f9f1a9fcbefdcc.zip | |
Auto merge of #2891 - RalfJung:rustup, r=RalfJung
Rustup
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, |