add From<Ip*Addr> implementations for cidr and inet types

Author: stbuehler

src/cidr/any.rs

@@ -2,7 +2,11 @@ use core::{
 	fmt,
 	str::FromStr,
 };
-use std::net::IpAddr;
+use std::net::{
+	IpAddr,
+	Ipv4Addr,
+	Ipv6Addr,
+};
 
 use crate::{
 	errors::*,
@@ -266,12 +270,30 @@ impl From<Ipv4Cidr> for AnyIpCidr {
 	}
 }
 
+impl From<Ipv4Addr> for AnyIpCidr {
+	fn from(address: Ipv4Addr) -> Self {
+		Self::V4(address.into())
+	}
+}
+
 impl From<Ipv6Cidr> for AnyIpCidr {
 	fn from(c: Ipv6Cidr) -> Self {
 		Self::V6(c)
 	}
 }
 
+impl From<Ipv6Addr> for AnyIpCidr {
+	fn from(address: Ipv6Addr) -> Self {
+		Self::V6(address.into())
+	}
+}
+
+impl From<IpAddr> for AnyIpCidr {
+	fn from(address: IpAddr) -> Self {
+		Self::new_host(address)
+	}
+}
+
 #[cfg(feature = "bitstring")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "bitstring")))]
 impl bitstring::BitString for AnyIpCidr {

src/cidr/combined.rs

@@ -2,7 +2,11 @@ use core::{
 	fmt,
 	str::FromStr,
 };
-use std::net::IpAddr;
+use std::net::{
+	IpAddr,
+	Ipv4Addr,
+	Ipv6Addr,
+};
 
 use super::from_str::cidr_from_str;
 use crate::{
@@ -237,12 +241,30 @@ impl From<Ipv4Cidr> for IpCidr {
 	}
 }
 
+impl From<Ipv4Addr> for IpCidr {
+	fn from(address: Ipv4Addr) -> Self {
+		Self::V4(address.into())
+	}
+}
+
 impl From<Ipv6Cidr> for IpCidr {
 	fn from(c: Ipv6Cidr) -> Self {
 		Self::V6(c)
 	}
 }
 
+impl From<Ipv6Addr> for IpCidr {
+	fn from(address: Ipv6Addr) -> Self {
+		Self::V6(address.into())
+	}
+}
+
+impl From<IpAddr> for IpCidr {
+	fn from(address: IpAddr) -> Self {
+		Self::new_host(address)
+	}
+}
+
 impl IntoIterator for IpCidr {
 	type IntoIter = InetIterator<IpAddr>;
 	type Item = IpInet;

src/cidr/direct.rs

@@ -278,6 +278,12 @@ macro_rules! impl_cidr_for {
 			}
 		}
 
+		impl From<$addr> for $n {
+			fn from(address: $addr) -> Self {
+				Self::new_host(address)
+			}
+		}
+
 		/// Iterate over all the addresses in the CIDR.
 		impl IntoIterator for $n {
 			type IntoIter = $crate::InetIterator<$addr>;

src/inet/combined.rs

@@ -2,7 +2,11 @@ use core::{
 	fmt,
 	str::FromStr,
 };
-use std::net::IpAddr;
+use std::net::{
+	IpAddr,
+	Ipv4Addr,
+	Ipv6Addr,
+};
 
 use super::from_str::inet_from_str;
 use crate::{
@@ -342,12 +346,30 @@ impl From<Ipv4Inet> for IpInet {
 	}
 }
 
+impl From<Ipv4Addr> for IpInet {
+	fn from(adress: Ipv4Addr) -> Self {
+		Self::V4(adress.into())
+	}
+}
+
 impl From<Ipv6Inet> for IpInet {
 	fn from(c: Ipv6Inet) -> Self {
 		Self::V6(c)
 	}
 }
 
+impl From<Ipv6Addr> for IpInet {
+	fn from(address: Ipv6Addr) -> Self {
+		Self::V6(address.into())
+	}
+}
+
+impl From<IpAddr> for IpInet {
+	fn from(address: IpAddr) -> Self {
+		Self::new_host(address)
+	}
+}
+
 impl core::ops::Add<u128> for IpInet {
 	type Output = IpInet;
 

src/inet/direct.rs

@@ -375,6 +375,12 @@ macro_rules! impl_inet_for {
 			}
 		}
 
+		impl From<$addr> for $n {
+			fn from(address: $addr) -> Self {
+				Self::new_host(address)
+			}
+		}
+
 		impl core::ops::Add<u128> for $n {
 			type Output = $n;