From 54e721551fc391c0bbccfcf57717daef67e04c33 Mon Sep 17 00:00:00 2001 From: Thomas de Zeeuw Date: Wed, 7 Jun 2023 13:16:40 +0200 Subject: [PATCH] Support MSRV 1.63 pointer::cast_mut was stablised in 1.65, so it's too new. --- src/lib.rs | 4 ++-- src/sys/unix.rs | 3 ++- src/sys/windows.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f657505b..7d417d81 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -606,7 +606,7 @@ impl<'addr, 'bufs, 'control> MsgHdr<'addr, 'bufs, 'control> { /// Corresponds to setting `msg_iov` and `msg_iovlen` on Unix and `lpBuffers` /// and `dwBufferCount` on Windows. pub fn with_buffers(mut self, bufs: &'bufs [IoSlice<'_>]) -> Self { - let ptr = bufs.as_ptr().cast_mut().cast(); + let ptr = bufs.as_ptr() as *mut _; sys::set_msghdr_iov(&mut self.inner, ptr, bufs.len()); self } @@ -616,7 +616,7 @@ impl<'addr, 'bufs, 'control> MsgHdr<'addr, 'bufs, 'control> { /// Corresponds to setting `msg_control` and `msg_controllen` on Unix and /// `Control` on Windows. pub fn with_control(mut self, buf: &'control [u8]) -> Self { - let ptr = buf.as_ptr().cast_mut().cast(); + let ptr = buf.as_ptr() as *mut _; sys::set_msghdr_control(&mut self.inner, ptr, buf.len()); self } diff --git a/src/sys/unix.rs b/src/sys/unix.rs index 3b8f385f..a388bdc6 100644 --- a/src/sys/unix.rs +++ b/src/sys/unix.rs @@ -648,11 +648,12 @@ pub(crate) use libc::msghdr; #[cfg(not(target_os = "redox"))] pub(crate) fn set_msghdr_name(msg: &mut msghdr, name: &SockAddr) { - msg.msg_name = name.as_ptr().cast_mut().cast(); + msg.msg_name = name.as_ptr() as *mut _; msg.msg_namelen = name.len(); } #[cfg(not(target_os = "redox"))] +#[allow(clippy::unnecessary_cast)] // IovLen type can be `usize`. pub(crate) fn set_msghdr_iov(msg: &mut msghdr, ptr: *mut libc::iovec, len: usize) { msg.msg_iov = ptr; msg.msg_iovlen = min(len, IovLen::MAX as usize) as IovLen; diff --git a/src/sys/windows.rs b/src/sys/windows.rs index 296b3dd2..0d22a649 100644 --- a/src/sys/windows.rs +++ b/src/sys/windows.rs @@ -191,7 +191,7 @@ impl<'a> MaybeUninitSlice<'a> { pub(crate) use windows_sys::Win32::Networking::WinSock::WSAMSG as msghdr; pub(crate) fn set_msghdr_name(msg: &mut msghdr, name: &SockAddr) { - msg.name = name.as_ptr().cast_mut().cast(); + msg.name = name.as_ptr() as *mut _; msg.namelen = name.len(); }