speculative windows build fix

wez · May 13, 2024 · ccc32fa · ccc32fa
1 parent eb6fc75
commit ccc32fa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/async_ossl/src/lib.rs b/async_ossl/src/lib.rs
@@ -40,6 +40,13 @@ impl std::os::windows::io::AsRawSocket for AsyncSslStream {
     }
 }
 
+#[cfg(windows)]
+impl std::os::windows::io::AsSocket for AsyncSslStream {
+    fn as_socket(&self) -> std::os::windows::io::BorrowedSocket {
+        self.s.get_ref().as_socket()
+    }
+}
+
 impl AsRawDesc for AsyncSslStream {}
 
 impl std::io::Read for AsyncSslStream {

diff --git a/filedescriptor/src/windows.rs b/filedescriptor/src/windows.rs
@@ -1,7 +1,7 @@
 use crate::{
-    AsRawFileDescriptor, AsRawSocketDescriptor, Error, FileDescriptor, FromRawFileDescriptor,
-    FromRawSocketDescriptor, IntoRawFileDescriptor, IntoRawSocketDescriptor, OwnedHandle, Pipe,
-    Result, StdioDescriptor,
+    AsRawFileDescriptor, AsRawSocketDescriptor, AsSocket, Error, FileDescriptor,
+    FromRawFileDescriptor, FromRawSocketDescriptor, IntoRawFileDescriptor, IntoRawSocketDescriptor,
+    OwnedHandle, Pipe, Result, StdioDescriptor,
 };
 use std::io::{self, Error as IoError};
 use std::os::windows::prelude::*;
@@ -320,6 +320,12 @@ impl AsRawSocket for FileDescriptor {
     }
 }
 
+impl AsSocket for FileDescriptor {
+    fn as_socket(&self) -> BorrowedSocket {
+        unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) }
+    }
+}
+
 impl FromRawSocket for FileDescriptor {
     unsafe fn from_raw_socket(handle: RawSocket) -> FileDescriptor {
         Self {

diff --git a/wezterm-client/src/client.rs b/wezterm-client/src/client.rs
@@ -572,6 +572,13 @@ impl std::os::windows::io::AsRawSocket for SshStream {
     }
 }
 
+#[cfg(windows)]
+impl std::os::windows::io::AsSocket for SshStream {
+    fn as_socket(&self) -> std::os::windows::io::BorrowedSocket {
+        self.stdout.as_socket()
+    }
+}
+
 impl Read for SshStream {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> {
         self.stdout.read(buf)

diff --git a/wezterm-mux-server-impl/src/dispatch.rs b/wezterm-mux-server-impl/src/dispatch.rs
@@ -11,7 +11,7 @@ use smol::Async;
 #[cfg(unix)]
 pub trait AsRawDesc: std::os::unix::io::AsRawFd + std::os::fd::AsFd {}
 #[cfg(windows)]
-pub trait AsRawDesc: std::os::windows::io::AsRawSocket {}
+pub trait AsRawDesc: std::os::windows::io::AsRawSocket + std::os::windows::io::AsSocket {}
 
 impl AsRawDesc for UnixStream {}
 impl AsRawDesc for AsyncSslStream {}