Fix for Rust 1.63

bytecodealliance · Apr 28, 2024 · f2b3389 · f2b3389
1 parent 013792a
commit f2b3389
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/backend/libc/net/addr.rs b/src/backend/libc/net/addr.rs
@@ -12,9 +12,6 @@ use {
     core::slice,
 };
 
-use super::write_sockaddr::{encode_sockaddr_v4, encode_sockaddr_v6};
-use crate::net::{SocketAddrV4, SocketAddrV6, SocketAddress};
-
 /// `struct sockaddr_un`
 #[cfg(unix)]
 #[derive(Clone)]

diff --git a/src/backend/libc/net/msghdr.rs b/src/backend/libc/net/msghdr.rs
@@ -70,7 +70,7 @@ pub(crate) fn with_msghdr<R>(
     addr.with_sockaddr(|addr_ptr, addr_len| {
         f({
             let mut h = zero_msghdr();
-            h.msg_name = addr_ptr.cast_mut().cast();
+            h.msg_name = addr_ptr as *mut _;
             h.msg_namelen = addr_len;
             h.msg_iov = iov.as_ptr() as _;
             h.msg_iovlen = msg_iov_len(iov.len());

diff --git a/src/backend/linux_raw/net/syscalls.rs b/src/backend/linux_raw/net/syscalls.rs
@@ -426,7 +426,7 @@ pub(crate) fn sendto(
                 buf_addr,
                 buf_len,
                 flags,
-                raw_arg(addr_ptr.cast_mut().cast()),
+                raw_arg(addr_ptr as *mut _),
                 socklen_t(addr_len)
             ))
         }
@@ -440,7 +440,7 @@ pub(crate) fn sendto(
                     buf_addr,
                     buf_len,
                     flags.into(),
-                    raw_arg(addr_ptr.cast_mut().cast()),
+                    raw_arg(addr_ptr as *mut _),
                     socklen_t(addr_len)
                 ])
             ))
@@ -626,7 +626,7 @@ pub(crate) fn bind(fd: BorrowedFd<'_>, addr: &impl SocketAddress) -> io::Result<
             ret(syscall_readonly!(
                 __NR_bind,
                 fd,
-                raw_arg(addr_ptr.cast_mut().cast()),
+                raw_arg(addr_ptr as *mut _),
                 socklen_t(addr_len)
             ))
         }
@@ -637,7 +637,7 @@ pub(crate) fn bind(fd: BorrowedFd<'_>, addr: &impl SocketAddress) -> io::Result<
                 x86_sys(SYS_BIND),
                 slice_just_addr::<ArgReg<'_, SocketArg>, _>(&[
                     fd.into(),
-                    raw_arg(addr_ptr.cast_mut().cast()),
+                    raw_arg(addr_ptr as *mut _),
                     socklen_t(addr_len)
                 ])
             ))
@@ -653,7 +653,7 @@ pub(crate) fn connect(fd: BorrowedFd<'_>, addr: &impl SocketAddress) -> io::Resu
             ret(syscall_readonly!(
                 __NR_connect,
                 fd,
-                raw_arg(addr_ptr.cast_mut().cast()),
+                raw_arg(addr_ptr as *mut _),
                 socklen_t(addr_len)
             ))
         }
@@ -664,7 +664,7 @@ pub(crate) fn connect(fd: BorrowedFd<'_>, addr: &impl SocketAddress) -> io::Resu
                 x86_sys(SYS_CONNECT),
                 slice_just_addr::<ArgReg<'_, SocketArg>, _>(&[
                     fd.into(),
-                    raw_arg(addr_ptr.cast_mut().cast()),
+                    raw_arg(addr_ptr as *mut _),
                     socklen_t(addr_len)
                 ])
             ))