try pass compile in windows

bytedance · Feb 8, 2024 · a30e577 · a30e577
1 parent 294f87d
commit a30e577
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/monoio/src/driver/op/open.rs b/monoio/src/driver/op/open.rs
@@ -81,13 +81,13 @@ impl OpAble for Open {
     fn legacy_call(&mut self) -> io::Result<u32> {
         syscall!(
             CreateFileW(
-                self.path.as_c_str().as_ptr(),
+                self.path.as_c_str().as_ptr().cast(),
                 self.opts.access_mode()?,
                 self.opts.share_mode,
                 self.opts.security_attributes,
                 self.opts.creation_mode()?,
                 self.opts.get_flags_and_attributes(),
-                std::ptr::null_mut(),
+                0,
             ),
             PartialEq::eq,
             INVALID_HANDLE_VALUE

diff --git a/monoio/src/driver/op/recv.rs b/monoio/src/driver/op/recv.rs
@@ -1,13 +1,7 @@
-use std::{
-    io,
-    mem::{transmute, MaybeUninit},
-    net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
-};
+use std::{io, net::SocketAddr};
 
 #[cfg(all(target_os = "linux", feature = "iouring"))]
 use io_uring::{opcode, types};
-#[cfg(unix)]
-use libc::{socklen_t, AF_INET, AF_INET6};
 #[cfg(all(windows, any(feature = "legacy", feature = "poll-io")))]
 use {
     crate::syscall,
@@ -16,11 +10,18 @@ use {
 };
 #[cfg(all(unix, any(feature = "legacy", feature = "poll-io")))]
 use {crate::syscall_u32, std::os::unix::prelude::AsRawFd};
+#[cfg(unix)]
+use {
+    libc::{socklen_t, AF_INET, AF_INET6},
+    net::unix::SocketAddr as UnixSocketAddr,
+    std::mem::{transmute, MaybeUninit},
+    std::net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6},
+};
 
 use super::{super::shared_fd::SharedFd, Op, OpAble};
 #[cfg(any(feature = "legacy", feature = "poll-io"))]
 use crate::driver::ready::Direction;
-use crate::{buf::IoBufMut, net::unix::SocketAddr as UnixSocketAddr, BufResult};
+use crate::{buf::IoBufMut, BufResult};
 
 pub(crate) struct Recv<T> {
     /// Holds a strong ref to the FD, preventing the file from being closed
@@ -293,7 +294,7 @@ impl<T: IoBufMut> Op<RecvMsgUnix<T>> {
         unimplemented!()
     }
 
-    pub(crate) async fn wait(self) -> BufResult<(usize, UnixSocketAddr), T> {
+    pub(crate) async fn wait(self) -> BufResult<(usize, SocketAddr), T> {
         unimplemented!()
     }
 }

diff --git a/monoio/src/driver/op/send.rs b/monoio/src/driver/op/send.rs
@@ -2,7 +2,8 @@ use std::{io, net::SocketAddr};
 
 #[cfg(all(target_os = "linux", feature = "iouring"))]
 use io_uring::{opcode, types};
-use socket2::SockAddr;
+#[cfg(unix)]
+use {crate::net::unix::SocketAddr as UnixSocketAddr, socket2::SockAddr};
 #[cfg(all(windows, any(feature = "legacy", feature = "poll-io")))]
 use {
     crate::syscall, std::os::windows::io::AsRawSocket,
@@ -14,7 +15,7 @@ use {crate::syscall_u32, std::os::unix::prelude::AsRawFd};
 use super::{super::shared_fd::SharedFd, Op, OpAble};
 #[cfg(any(feature = "legacy", feature = "poll-io"))]
 use crate::driver::ready::Direction;
-use crate::{buf::IoBuf, net::unix::SocketAddr as UnixSocketAddr, BufResult};
+use crate::{buf::IoBuf, BufResult};
 
 pub(crate) struct Send<T> {
     /// Holds a strong ref to the FD, preventing the file from being closed
@@ -276,7 +277,7 @@ impl<T: IoBuf> Op<SendMsgUnix<T>> {
     pub(crate) fn send_msg_unix(
         fd: SharedFd,
         buf: T,
-        socket_addr: Option<UnixSocketAddr>,
+        socket_addr: Option<SocketAddr>,
     ) -> io::Result<Self> {
         unimplemented!()
     }

diff --git a/monoio/src/driver/util.rs b/monoio/src/driver/util.rs
@@ -43,7 +43,7 @@ macro_rules! syscall {
         if $err_test(&res, &$err_value) {
             Err(io::Error::last_os_error())
         } else {
-            Ok(res)
+            Ok(res.try_into().unwrap())
         }
     }};
 }

diff --git a/monoio/src/io/util/copy.rs b/monoio/src/io/util/copy.rs
@@ -2,10 +2,9 @@
 
 use std::io;
 
-use crate::{
-    io::{AsyncReadRent, AsyncWriteRent, AsyncWriteRentExt},
-    net::unix::new_pipe,
-};
+use crate::io::{AsyncReadRent, AsyncWriteRent, AsyncWriteRentExt};
+#[cfg(unix)]
+use crate::net::unix::new_pipe;
 
 const BUF_SIZE: usize = 4 * 1024;
 

diff --git a/monoio/src/net/mod.rs b/monoio/src/net/mod.rs
@@ -94,7 +94,7 @@ pub(crate) fn new_socket(
     socket.set_nonblocking(true).map_err(|e| {
         // If either of the `ioctlsocket` calls failed, ensure the socket is
         // closed and return the error.
-        windows_sys::Win32::Networking::WinSock::closesocket(raw_socket as _);
+        unsafe { windows_sys::Win32::Networking::WinSock::closesocket(raw_socket as _) };
         e
     })?;
     Ok(raw_socket)