From 3df015bbf580dba21f9db148ba59c186be4e2975 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 7 Sep 2024 16:05:31 +0200 Subject: [PATCH 1/2] Bump windows-sys from 0.48 to 0.59 --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d69106623..cf1236439 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2640,7 +2640,7 @@ dependencies = [ "libc", "parse_datetime", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -2698,7 +2698,7 @@ dependencies = [ "clap", "glob", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -2824,7 +2824,7 @@ dependencies = [ "dns-lookup", "hostname", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3115,7 +3115,7 @@ dependencies = [ "libc", "uucore", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3261,7 +3261,7 @@ dependencies = [ "libc", "nix", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3288,7 +3288,7 @@ dependencies = [ "same-file", "uucore", "winapi-util", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3329,7 +3329,7 @@ dependencies = [ "filetime", "parse_datetime", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3465,7 +3465,7 @@ dependencies = [ "clap", "libc", "uucore", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3512,7 +3512,7 @@ dependencies = [ "walkdir", "wild", "winapi-util", - "windows-sys 0.48.0", + "windows-sys 0.59.0", "xattr", "z85", ] diff --git a/Cargo.toml b/Cargo.toml index 76e6491d4..56e0b9a7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -341,7 +341,7 @@ utf-8 = "0.7.6" utmp-classic = "0.1.6" walkdir = "2.5" winapi-util = "0.1.8" -windows-sys = { version = "0.48.0", default-features = false } +windows-sys = { version = "0.59.0", default-features = false } xattr = "1.3.1" zip = { version = "1.1.4", default-features = false, features = ["deflate"] } From 4229771108cd5127d907f18a3b082e95b3878d8c Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 7 Sep 2024 16:36:29 +0200 Subject: [PATCH 2/2] tail: adapt to windows-sys API change --- src/uu/tail/src/platform/windows.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uu/tail/src/platform/windows.rs b/src/uu/tail/src/platform/windows.rs index 592516162..d6e0828c9 100644 --- a/src/uu/tail/src/platform/windows.rs +++ b/src/uu/tail/src/platform/windows.rs @@ -21,7 +21,7 @@ impl ProcessChecker { let FALSE: BOOL = 0; let h = unsafe { OpenProcess(PROCESS_SYNCHRONIZE, FALSE, process_id) }; Self { - dead: h == 0, + dead: h.is_null(), handle: h, } }