Merge pull request #239 from epage/ci

fix(wincon): Restore MSRV

Author: epage

.github/workflows/ci.yml

@@ -54,7 +54,10 @@ jobs:
       run: cargo hack test --feature-powerset --workspace
   msrv:
     name: "Check MSRV"
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest"]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

Cargo.lock

@@ -41,6 +41,7 @@ where
     S: anstyle_wincon::WinconStream,
     S: IsTerminal,
 {
+    /// Returns `true` if the descriptor/handle refers to a terminal/tty.
     #[inline]
     pub fn is_terminal(&self) -> bool {
         self.raw.is_terminal()

crates/anstream/src/wincon.rs

@@ -11,7 +11,7 @@ mod windows_console {
 
     fn enable_vt(handle: RawHandle) -> std::io::Result<()> {
         unsafe {
-            let handle: HANDLE = std::mem::transmute(handle);
+            let handle: HANDLE = handle as HANDLE;
             if handle.is_null() {
                 return Err(std::io::Error::new(
                     std::io::ErrorKind::BrokenPipe,
@@ -33,7 +33,7 @@ mod windows_console {
         }
     }
 
-    pub fn enable_virtual_terminal_processing() -> std::io::Result<()> {
+    pub(crate) fn enable_virtual_terminal_processing() -> std::io::Result<()> {
         let stdout = std::io::stdout();
         let stdout_handle = stdout.as_raw_handle();
         let stderr = std::io::stderr();
@@ -72,7 +72,7 @@ pub fn enable_ansi_colors() -> Option<bool> {
     windows_console::enable_ansi_colors()
 }
 
-/// Raw ENABLE_VIRTUAL_TERMINAL_PROCESSING on stdout/stderr
+/// Raw `ENABLE_VIRTUAL_TERMINAL_PROCESSING` on stdout/stderr
 #[cfg(windows)]
 pub fn enable_virtual_terminal_processing() -> std::io::Result<()> {
     windows_console::enable_virtual_terminal_processing()

crates/anstyle-query/src/windows.rs

@@ -33,6 +33,7 @@ lexopt = "0.3.0"
 
 [target.'cfg(windows)'.dependencies]
 windows-sys = { version = "0.59.0", features = ["Win32_System_Console", "Win32_Foundation"] }
+once_cell = "1.20.2"
 
 [lints]
 workspace = true

crates/anstyle-wincon/Cargo.toml

@@ -18,8 +18,9 @@ fn main() -> Result<(), lexopt::Error> {
     let fg = args.fg.and_then(|c| c.into_ansi());
     let bg = args.bg.and_then(|c| c.into_ansi());
 
-    let _ = stdout.write_colored(fg, bg, "".as_bytes());
+    let _ = stdout.write_colored(fg, bg, b"");
 
+    #[allow(clippy::mem_forget)]
     std::mem::forget(stdout);
 
     Ok(())

crates/anstyle-wincon/examples/set-wincon.rs

@@ -8,20 +8,16 @@ type StdioColorInnerResult = Result<(anstyle::AnsiColor, anstyle::AnsiColor), in
 
 /// Cached [`get_colors`] call for [`std::io::stdout`]
 pub fn stdout_initial_colors() -> StdioColorResult {
-    static INITIAL: std::sync::OnceLock<StdioColorInnerResult> = std::sync::OnceLock::new();
-    INITIAL
-        .get_or_init(|| get_colors_(&std::io::stdout()))
-        .clone()
-        .map_err(Into::into)
+    static INITIAL: once_cell::sync::OnceCell<StdioColorInnerResult> =
+        once_cell::sync::OnceCell::new();
+    (*INITIAL.get_or_init(|| get_colors_(&std::io::stdout()))).map_err(Into::into)
 }
 
 /// Cached [`get_colors`] call for [`std::io::stderr`]
 pub fn stderr_initial_colors() -> StdioColorResult {
-    static INITIAL: std::sync::OnceLock<StdioColorInnerResult> = std::sync::OnceLock::new();
-    INITIAL
-        .get_or_init(|| get_colors_(&std::io::stderr()))
-        .clone()
-        .map_err(Into::into)
+    static INITIAL: once_cell::sync::OnceCell<StdioColorInnerResult> =
+        once_cell::sync::OnceCell::new();
+    (*INITIAL.get_or_init(|| get_colors_(&std::io::stderr()))).map_err(Into::into)
 }
 
 /// Apply colors to future writes
@@ -129,7 +125,7 @@ mod inner {
         handle: RawHandle,
     ) -> Result<CONSOLE_SCREEN_BUFFER_INFO, IoError> {
         unsafe {
-            let handle: HANDLE = std::mem::transmute(handle);
+            let handle: HANDLE = handle as HANDLE;
             if handle.is_null() {
                 return Err(IoError::BrokenPipe);
             }
@@ -150,7 +146,7 @@ mod inner {
         attributes: CONSOLE_CHARACTER_ATTRIBUTES,
     ) -> Result<(), IoError> {
         unsafe {
-            let handle: HANDLE = std::mem::transmute(handle);
+            let handle: HANDLE = handle as HANDLE;
             if handle.is_null() {
                 return Err(IoError::BrokenPipe);
             }
@@ -258,7 +254,7 @@ mod inner {
         for expected in COLORS {
             let nibble = to_nibble(expected);
             let actual = from_nibble(nibble);
-            assert_eq!(expected, actual, "Intermediate: {}", nibble);
+            assert_eq!(expected, actual, "Intermediate: {nibble}");
         }
     }
 }