prefer ptr::from_ref

dimbleby · May 26, 2024 · fc7de4b · fc7de4b
1 parent f7c9d8e
commit fc7de4b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/a.rs b/src/a.rs
@@ -38,7 +38,7 @@ impl AResults {
                 data.len() as c_int,
                 ptr::null_mut(),
                 results.addrttls.as_mut_ptr(),
-                (&mut results.naddrttls as *mut usize).cast(),
+                ptr::from_mut(&mut results.naddrttls).cast(),
             )
         };
         if parse_status == c_ares_sys::ares_status_t::ARES_SUCCESS as i32 {

diff --git a/src/aaaa.rs b/src/aaaa.rs
@@ -37,7 +37,7 @@ impl AAAAResults {
                 data.len() as c_int,
                 ptr::null_mut(),
                 results.addr6ttls.as_mut_ptr(),
-                (&mut results.naddr6ttls as *mut usize).cast(),
+                ptr::from_mut(&mut results.naddr6ttls).cast(),
             )
         };
         if parse_status == c_ares_sys::ares_status_t::ARES_SUCCESS as i32 {

diff --git a/src/channel.rs b/src/channel.rs
@@ -205,7 +205,7 @@ impl Options {
     {
         let boxed_callback = Arc::new(callback);
         self.ares_options.sock_state_cb = Some(socket_state_callback::<F>);
-        self.ares_options.sock_state_cb_data = (&*boxed_callback as *const F).cast_mut().cast();
+        self.ares_options.sock_state_cb_data = ptr::from_ref(&*boxed_callback).cast_mut().cast();
         self.socket_state_callback = Some(boxed_callback);
         self.optmask |= c_ares_sys::ARES_OPT_SOCK_STATE_CB;
         self
@@ -498,10 +498,7 @@ impl Channel {
     pub fn set_local_ipv6(&mut self, ipv6: &Ipv6Addr) -> &mut Self {
         let in6_addr = ipv6_as_in6_addr(ipv6);
         unsafe {
-            c_ares_sys::ares_set_local_ip6(
-                self.ares_channel,
-                (&in6_addr as *const c_types::in6_addr).cast(),
-            )
+            c_ares_sys::ares_set_local_ip6(self.ares_channel, ptr::from_ref(&in6_addr).cast())
         }
         self
     }
@@ -544,7 +541,7 @@ impl Channel {
         F: FnMut(&str, bool, ServerStateFlags) + Send + 'static,
     {
         let boxed_callback = Arc::new(callback);
-        let data = (&*boxed_callback as *const F).cast_mut().cast();
+        let data = ptr::from_ref(&*boxed_callback).cast_mut().cast();
         unsafe {
             c_ares_sys::ares_set_server_state_callback(
                 self.ares_channel,
@@ -987,11 +984,11 @@ impl Channel {
         let c_addr = match *address {
             IpAddr::V4(v4) => {
                 in_addr = ipv4_as_in_addr(v4);
-                (&in_addr as *const c_types::in_addr).cast()
+                ptr::from_ref(&in_addr).cast()
             }
             IpAddr::V6(ref v6) => {
                 in6_addr = ipv6_as_in6_addr(v6);
-                (&in6_addr as *const c_types::in6_addr).cast()
+                ptr::from_ref(&in6_addr).cast()
             }
         };
         let (family, length) = match *address {
@@ -1047,11 +1044,11 @@ impl Channel {
         let c_addr = match *address {
             SocketAddr::V4(ref v4) => {
                 sockaddr_in = socket_addrv4_as_sockaddr_in(v4);
-                (&sockaddr_in as *const c_types::sockaddr_in).cast()
+                ptr::from_ref(&sockaddr_in).cast()
             }
             SocketAddr::V6(ref v6) => {
                 sockaddr_in6 = socket_addrv6_as_sockaddr_in6(v6);
-                (&sockaddr_in6 as *const c_types::sockaddr_in6).cast()
+                ptr::from_ref(&sockaddr_in6).cast()
             }
         };
         let length = match *address {

diff --git a/src/hostent.rs b/src/hostent.rs
@@ -1,9 +1,8 @@
 use std::ffi::CStr;
-use std::fmt;
 use std::marker::PhantomData;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::os::raw::c_char;
-use std::slice;
+use std::{fmt, ptr, slice};
 
 use itertools::Itertools;
 
@@ -161,7 +160,7 @@ impl<'a> Iterator for HostAddressResultsIter<'a> {
             None
         } else {
             unsafe {
-                self.next = &*(self.next as *const *const c_char).offset(1);
+                self.next = &*ptr::from_ref(self.next).offset(1);
                 self.family
                     .and_then(|family| ip_address_from_bytes(family, h_addr.cast()))
             }
@@ -190,7 +189,7 @@ impl<'a> Iterator for HostAliasResultsIter<'a> {
             None
         } else {
             unsafe {
-                self.next = &*(self.next as *const *const c_char).offset(1);
+                self.next = &*ptr::from_ref(self.next).offset(1);
                 let c_str = CStr::from_ptr(h_alias);
                 Some(c_str)
             }