bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #135487 - klensy:windows-0.59, r=Mark-Simulacrum

Browse source 
bump compiler and tools to windows 0.59, bootstrap to 0.57

This bumps compiler and tools to windows 0.59 (temporary dupes version, as `sysinfo` still depend on <= 0.57).
Bootstrap bumps only to 0.57 (the same sysinfo dep).

This additionally resolves my comment https://github.com/rust-lang/rust/pull/130874#issuecomment-2393562071

Will work on it in follow up pr: There still some sus imports for `rustc_driver.dll` like ws2_32 or RoOriginateErrorW, but i will look at them later.
This commit is contained in:
bors 2025-01-21 22:29:46 +00:00
commit a24bdc60ce
13 changed files with 153 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_session/Cargo.toml
View file

@ -31,7 +31,7 @@ libc = "0.2"
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]
version = "0.57.0"
version = "0.59.0"
features = [
"Win32_Foundation",
"Win32_System_LibraryLoader",

2
compiler/rustc_session/src/filesearch.rs
View file

@ -145,7 +145,7 @@ fn current_dll_path() -> Result<PathBuf, String> {
.map_err(|e| e.to_string())?;
let mut filename = vec![0; 1024];
let n = unsafe { GetModuleFileNameW(module, &mut filename) } as usize;
let n = unsafe { GetModuleFileNameW(Some(module), &mut filename) } as usize;
if n == 0 {
return Err(format!("GetModuleFileNameW failed: {}", io::Error::last_os_error()));
}