build: upgrade windows-sys 0.52 → 0.59

Author: ErichDonGubler

Cargo.toml

@@ -31,3 +31,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
   'cfg(tokio_unstable)',
   'cfg(tokio_uring)',
 ] }
+
+[patch.crates-io]
+# TODO: Consume a release of `socket2` that contains <https://github.com/rust-lang/socket2/pull/545>.
+socket2 = { git = "https://github.com/erichdongubler-contrib/socket2", rev = "d4ed5f73ddb051ac700e1b7ee66a72905a86a05e" }

examples/Cargo.toml

@@ -25,7 +25,7 @@ httpdate = "1.0"
 once_cell = "1.5.2"
 
 [target.'cfg(windows)'.dev-dependencies.windows-sys]
-version = "0.52"
+version = "0.59"
 
 [[example]]
 name = "chat"

tokio/Cargo.toml

@@ -92,7 +92,7 @@ pin-project-lite = "0.2.11"
 
 # Everything else is optional...
 bytes = { version = "1.2.1", optional = true }
-mio = { version = "1.0.1", optional = true, default-features = false }
+mio = { version = "1.0.4", optional = true, default-features = false }
 parking_lot = { version = "0.12.0", optional = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
@@ -106,7 +106,7 @@ tracing = { version = "0.1.29", default-features = false, features = ["std"], op
 [target.'cfg(all(tokio_uring, target_os = "linux"))'.dependencies]
 io-uring = { version = "0.7.6", default-features = false }
 libc = { version = "0.2.168" }
-mio = { version = "1.0.1", default-features = false, features = ["os-poll", "os-ext"] }
+mio = { version = "1.0.4", default-features = false, features = ["os-poll", "os-ext"] }
 slab = "0.4.9"
 
 # Currently unstable. The API exposed by these features may be broken at any time.
@@ -123,11 +123,11 @@ libc = { version = "0.2.168" }
 nix = { version = "0.29.0", default-features = false, features = ["aio", "fs", "socket"] }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.52"
+version = "0.59"
 optional = true
 
 [target.'cfg(windows)'.dev-dependencies.windows-sys]
-version = "0.52"
+version = "0.59"
 features = [
   "Win32_Foundation",
   "Win32_Security_Authorization",

tokio/src/net/windows/named_pipe.rs

@@ -7,6 +7,7 @@ use std::ffi::OsStr;
 use std::io::{self, Read, Write};
 use std::pin::Pin;
 use std::ptr;
+use std::ptr::null_mut;
 use std::task::{Context, Poll};
 
 use crate::io::{AsyncRead, AsyncWrite, Interest, PollEvented, ReadBuf, Ready};
@@ -2556,7 +2557,7 @@ impl ClientOptions {
             attrs as *mut _,
             windows_sys::OPEN_EXISTING,
             self.get_flags(),
-            0,
+            null_mut(),
         );
 
         if h == windows_sys::INVALID_HANDLE_VALUE {

tokio/src/process/windows.rs

@@ -28,6 +28,7 @@ use std::os::windows::prelude::{AsRawHandle, IntoRawHandle, OwnedHandle, RawHand
 use std::pin::Pin;
 use std::process::Stdio;
 use std::process::{Child as StdChild, ExitStatus};
+use std::ptr::null_mut;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
@@ -119,7 +120,7 @@ impl Future for Child {
             }
             let (tx, rx) = oneshot::channel();
             let ptr = Box::into_raw(Box::new(Some(tx)));
-            let mut wait_object = 0;
+            let mut wait_object = null_mut();
             let rc = unsafe {
                 RegisterWaitForSingleObject(
                     &mut wait_object,