bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #121265 - klensy:bump-18-02-24, r=Mark-Simulacrum

Browse source 
bump some deps

First commit dedupes darling* crates and remove one more syn 1.* dep
Second one bumps windows crate to 0.52
This commit is contained in:
bors 2024-02-18 16:54:15 +00:00
commit c9c83cca51
13 changed files with 37 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_data_structures/Cargo.toml
View file

@ -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",

1
compiler/rustc_data_structures/src/flock/windows.rs
View file

@ -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);

6
compiler/rustc_data_structures/src/profiling.rs
View file

@ -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,