Merge pull request #208 from rust-cli/renovate/windows-sys-0.x

chore(deps): Update Rust crate windows-sys to 0.59.0
rust-cli · Aug 1, 2024 · 4b8b9c5 · 4b8b9c5
2 parents 0b348fb + cc7f55b
commit 4b8b9c5
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anstyle-query/Cargo.toml b/crates/anstyle-query/Cargo.toml
@@ -24,7 +24,7 @@ pre-release-replacements = [
 ]
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52.0", features = ["Win32_System_Console", "Win32_Foundation"] }
+windows-sys = { version = "0.59.0", features = ["Win32_System_Console", "Win32_Foundation"] }
 
 [lints]
 workspace = true
diff --git a/crates/anstyle-query/src/windows.rs b/crates/anstyle-query/src/windows.rs
@@ -5,13 +5,14 @@ mod windows_console {
     use std::os::windows::io::AsRawHandle;
     use std::os::windows::io::RawHandle;
 
+    use windows_sys::Win32::Foundation::HANDLE;
     use windows_sys::Win32::System::Console::CONSOLE_MODE;
     use windows_sys::Win32::System::Console::ENABLE_VIRTUAL_TERMINAL_PROCESSING;
 
     fn enable_vt(handle: RawHandle) -> std::io::Result<()> {
         unsafe {
-            let handle = std::mem::transmute(handle);
-            if handle == 0 {
+            let handle: HANDLE = std::mem::transmute(handle);
+            if handle.is_null() {
                 return Err(std::io::Error::new(
                     std::io::ErrorKind::BrokenPipe,
                     "console is detached",

diff --git a/crates/anstyle-wincon/Cargo.toml b/crates/anstyle-wincon/Cargo.toml
@@ -32,7 +32,7 @@ anstyle = { version = "1.0.0", path = "../anstyle" }
 lexopt = "0.3.0"
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52.0", features = ["Win32_System_Console", "Win32_Foundation"] }
+windows-sys = { version = "0.59.0", features = ["Win32_System_Console", "Win32_Foundation"] }
 
 [lints]
 workspace = true
diff --git a/crates/anstyle-wincon/src/windows.rs b/crates/anstyle-wincon/src/windows.rs
@@ -86,15 +86,16 @@ pub(crate) fn write_colored<S: AsHandle + std::io::Write>(
 }
 
 mod inner {
+    use std::os::windows::io::RawHandle;
+
+    use windows_sys::Win32::Foundation::HANDLE;
     use windows_sys::Win32::System::Console::CONSOLE_CHARACTER_ATTRIBUTES;
     use windows_sys::Win32::System::Console::CONSOLE_SCREEN_BUFFER_INFO;
     use windows_sys::Win32::System::Console::FOREGROUND_BLUE;
     use windows_sys::Win32::System::Console::FOREGROUND_GREEN;
     use windows_sys::Win32::System::Console::FOREGROUND_INTENSITY;
     use windows_sys::Win32::System::Console::FOREGROUND_RED;
 
-    use std::os::windows::io::RawHandle;
-
     const FOREGROUND_CYAN: CONSOLE_CHARACTER_ATTRIBUTES = FOREGROUND_BLUE | FOREGROUND_GREEN;
     const FOREGROUND_MAGENTA: CONSOLE_CHARACTER_ATTRIBUTES = FOREGROUND_BLUE | FOREGROUND_RED;
     const FOREGROUND_YELLOW: CONSOLE_CHARACTER_ATTRIBUTES = FOREGROUND_GREEN | FOREGROUND_RED;
@@ -128,8 +129,8 @@ mod inner {
         handle: RawHandle,
     ) -> Result<CONSOLE_SCREEN_BUFFER_INFO, IoError> {
         unsafe {
-            let handle = std::mem::transmute(handle);
-            if handle == 0 {
+            let handle: HANDLE = std::mem::transmute(handle);
+            if handle.is_null() {
                 return Err(IoError::BrokenPipe);
             }
 
@@ -149,8 +150,8 @@ mod inner {
         attributes: CONSOLE_CHARACTER_ATTRIBUTES,
     ) -> Result<(), IoError> {
         unsafe {
-            let handle = std::mem::transmute(handle);
-            if handle == 0 {
+            let handle: HANDLE = std::mem::transmute(handle);
+            if handle.is_null() {
                 return Err(IoError::BrokenPipe);
             }