Support both windows-sys 0.52 and 0.59. (#42)

* Support both windows-sys 0.52 and 0.59.

* Uhdate the wasm32-wasi target.

Author: sunfishcode

.github/workflows/main.yml

@@ -71,8 +71,8 @@ jobs:
         toolchain: ${{ matrix.rust }}
     - run: >
         rustup target add
-        wasm32-wasi
-    - run: cargo check --workspace --release -vv --target=wasm32-wasi --all-targets
+        wasm32-wasip2
+    - run: cargo check --workspace --release -vv --target=wasm32-wasip2 --all-targets
 
   test:
     name: Test

Cargo.toml

@@ -22,7 +22,7 @@ libc = "0.2"
 hermit-abi = "0.4.0"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.59.0"
+version = ">=0.52, <=0.59"
 features = [
     "Win32_Foundation",
     "Win32_Storage_FileSystem",
@@ -33,7 +33,7 @@ features = [
 atty = "0.2.14"
 
 [target.'cfg(any(unix, target_os = "wasi"))'.dev-dependencies]
-rustix = { version = "0.38.0", features = ["termios"] }
+rustix = { version = "0.38.44", features = ["termios"] }
 libc = "0.2.110"
 
 [target.'cfg(not(any(windows, target_os = "hermit", target_os = "unknown")))'.dev-dependencies]

src/lib.rs

@@ -36,12 +36,12 @@
     no_std
 )]
 
+#[cfg(target_os = "wasi")]
+use std::os::fd::{AsFd, AsRawFd};
 #[cfg(target_os = "hermit")]
 use std::os::hermit::io::AsFd;
 #[cfg(unix)]
 use std::os::unix::io::{AsFd, AsRawFd};
-#[cfg(target_os = "wasi")]
-use std::os::wasi::io::{AsFd, AsRawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle};
 #[cfg(windows)]
@@ -123,13 +123,13 @@ fn handle_is_console(handle: BorrowedHandle<'_>) -> bool {
 
     unsafe {
         let mut out = 0;
-        if GetConsoleMode(handle, &mut out) != 0 {
+        if GetConsoleMode(handle as HANDLE, &mut out) != 0 {
             // False positives aren't possible. If we got a console then we definitely have a console.
             return true;
         }
 
         // Otherwise, we fall back to an msys hack to see if we can detect the presence of a pty.
-        msys_tty_on(handle)
+        msys_tty_on(handle as HANDLE)
     }
 }