Skip to content

Commit 354f9b2

Browse files
committed
Auto merge of #14335 - rust-lang:renovate/windows-sys-0.x, r=epage
chore(deps): update rust crate windows-sys to 0.59 [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [windows-sys](https://togithub.com/microsoft/windows-rs) | workspace.dependencies | minor | `0.52` -> `0.59` | --- ### Release Notes <details> <summary>microsoft/windows-rs (windows-sys)</summary> ### [`v0.59.0`](https://togithub.com/microsoft/windows-rs/releases/tag/0.59.0) [Compare Source](https://togithub.com/microsoft/windows-rs/compare/0.52.0...0.59.0) This release includes an update to the [windows-sys](https://crates.io/crates/windows-sys) crate only. The `windows-sys` crate is updated very infrequently and only when there is an explicit need to do so. The 0.59.0 release includes a rollup of API fixes, updates, and additions since the [0.52.0](https://togithub.com/microsoft/windows-rs/releases/tag/0.52.0) release nine months ago. Notably: - This update introduces support for Arm64EC ([#&#8203;2957](https://togithub.com/microsoft/windows-rs/issues/2957)) - Updated bindings for the latest APIs https://github.com/microsoft/windows-rs/tree/0.59.0/crates/libs/bindgen/default - Derive standard traits ([#&#8203;3041](https://togithub.com/microsoft/windows-rs/issues/3041)) - Updates to code generation to handle newer Rust warnings and lints - Overall smaller crate and more efficient code gen to reduce build time - Support for feature search https://microsoft.github.io/windows-rs/features/#/0.59.0 - MSRV is updated to 1.60 **Full Changelog**: microsoft/windows-rs@0.52.0...0.59.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/rust-lang/cargo). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbXX0=-->
2 parents ad519ac + cb085c0 commit 354f9b2

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

Cargo.lock

Lines changed: 15 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ unicode-xid = "0.2.4"
108108
url = "2.5.2"
109109
varisat = "0.2.2"
110110
walkdir = "2.5.0"
111-
windows-sys = "0.52"
111+
windows-sys = "0.59"
112112

113113
[workspace.lints.rust]
114114
rust_2018_idioms = "warn" # TODO: could this be removed?

crates/home/src/windows.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ pub fn home_dir_inner() -> Option<PathBuf> {
2020
fn home_dir_crt() -> Option<PathBuf> {
2121
unsafe {
2222
let mut path = ptr::null_mut();
23-
match SHGetKnownFolderPath(&FOLDERID_Profile, KF_FLAG_DONT_VERIFY as u32, 0, &mut path) {
23+
match SHGetKnownFolderPath(
24+
&FOLDERID_Profile,
25+
KF_FLAG_DONT_VERIFY as u32,
26+
std::ptr::null_mut(),
27+
&mut path,
28+
) {
2429
S_OK => {
2530
let path_slice = slice::from_raw_parts(path, wcslen(path));
2631
let s = OsString::from_wide(&path_slice);

src/cargo/core/shell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ mod imp {
662662
ptr::null_mut(),
663663
OPEN_EXISTING,
664664
0,
665-
0,
665+
std::ptr::null_mut(),
666666
);
667667
if h == INVALID_HANDLE_VALUE {
668668
return TtyWidth::NoTty;

0 commit comments

Comments
 (0)