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_session | |
| 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_session')
| -rw-r--r-- | compiler/rustc_session/Cargo.toml | 2 | ||||
| -rw-r--r-- | compiler/rustc_session/src/filesearch.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml index 3477b97438c..3af83aaaaa8 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml @@ -25,7 +25,7 @@ termize = "0.1.1" libc = "0.2" [target.'cfg(windows)'.dependencies.windows] -version = "0.46.0" +version = "0.48.0" features = [ "Win32_Foundation", "Win32_System_LibraryLoader", diff --git a/compiler/rustc_session/src/filesearch.rs b/compiler/rustc_session/src/filesearch.rs index 7fdbd48d563..3988416d0c7 100644 --- a/compiler/rustc_session/src/filesearch.rs +++ b/compiler/rustc_session/src/filesearch.rs @@ -135,13 +135,13 @@ fn current_dll_path() -> Result<PathBuf, String> { use windows::{ core::PCWSTR, - Win32::Foundation::HINSTANCE, + Win32::Foundation::HMODULE, Win32::System::LibraryLoader::{ GetModuleFileNameW, GetModuleHandleExW, GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, }, }; - let mut module = HINSTANCE::default(); + let mut module = HMODULE::default(); unsafe { GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, |