refactor: replace IpVersion::to_socket_addr with Into<IpAddr> bound

M4SS-Code · Dec 30, 2024 · 164fde0 · 164fde0
1 parent e59c8f6
commit 164fde0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/src/ip_version.rs b/src/ip_version.rs
@@ -1,32 +1,29 @@
 use std::{
     hash::Hash,
-    net::{Ipv4Addr, Ipv6Addr},
+    net::{IpAddr, Ipv4Addr, Ipv6Addr},
 };
 
 /// Either an [`Ipv4Addr`] or an [`Ipv6Addr`].
-pub trait IpVersion: Copy + Hash + Eq + Unpin + Send + Sync + 'static + private::Sealed {}
+pub trait IpVersion:
+    Copy + Hash + Eq + Unpin + Send + Sync + Into<IpAddr> + 'static + private::Sealed
+{
+}
 
 impl IpVersion for Ipv4Addr {}
 impl IpVersion for Ipv6Addr {}
 
 pub(crate) mod private {
-    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
     pub trait Sealed: Sized {
         const IS_V4: bool;
 
-        fn to_socket_addr(self) -> SocketAddr;
-
         fn from_ip_addr(addr: IpAddr) -> Option<Self>;
     }
 
     impl Sealed for Ipv4Addr {
         const IS_V4: bool = true;
 
-        fn to_socket_addr(self) -> SocketAddr {
-            SocketAddr::new(IpAddr::V4(self), 0)
-        }
-
         fn from_ip_addr(addr: IpAddr) -> Option<Self> {
             match addr {
                 IpAddr::V4(v4) => Some(v4),
@@ -37,10 +34,6 @@ pub(crate) mod private {
     impl Sealed for Ipv6Addr {
         const IS_V4: bool = false;
 
-        fn to_socket_addr(self) -> SocketAddr {
-            SocketAddr::new(IpAddr::V6(self), 0)
-        }
-
         fn from_ip_addr(addr: IpAddr) -> Option<Self> {
             match addr {
                 IpAddr::V4(_) => None,

diff --git a/src/raw_pinger/blocking.rs b/src/raw_pinger/blocking.rs
@@ -3,7 +3,7 @@ use std::{
     io,
     marker::PhantomData,
     mem::{self, MaybeUninit},
-    net::IpAddr,
+    net::{IpAddr, SocketAddr},
     time::Duration,
 };
 
@@ -31,7 +31,7 @@ impl<V: IpVersion> RawBlockingPinger<V> {
 
     /// Send a ICMP ECHO request packet
     pub fn send_to(&self, addr: V, packet: &EchoRequestPacket<V>) -> io::Result<()> {
-        let addr = addr.to_socket_addr();
+        let addr = SocketAddr::new(addr.into(), 0);
         self.socket.send_to(packet.as_bytes(), addr).map(|_sent| ())
     }
 

diff --git a/src/raw_pinger/mod.rs b/src/raw_pinger/mod.rs
@@ -6,7 +6,7 @@ use std::{
     io,
     marker::PhantomData,
     mem::{self, MaybeUninit},
-    net::{IpAddr, Ipv4Addr, Ipv6Addr},
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
     pin::Pin,
     task::{ready, Context, Poll},
 };
@@ -57,7 +57,7 @@ impl<V: IpVersion> RawPinger<V> {
         addr: V,
         packet: &EchoRequestPacket<V>,
     ) -> Poll<io::Result<()>> {
-        let addr = addr.to_socket_addr();
+        let addr = SocketAddr::new(addr.into(), 0);
 
         let result = ready!(self.socket.poll_write_to(cx, packet.as_bytes(), addr));
         Poll::Ready(result.map(|_sent| ()))