add TryFrom<IpNet> impls

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "prefixset"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 authors = ["Ben Maddison <benm@workonline.africa>"]
 description = "An efficient set container for IP address prefixes"
 edition = "2018"

src/error.rs

@@ -15,6 +15,8 @@ pub enum Error {
         /// The error returned during parsing, if any.
         source: Option<ParseIntError>,
     },
+    /// Incompatible address families.
+    AddressFamiltMismatch,
 }
 
 impl std::error::Error for Error {
@@ -34,6 +36,7 @@ impl fmt::Display for Error {
             Self::AddrParse(ref err) => err.fmt(f),
             Self::PrefixLen(ref err) => err.fmt(f),
             Self::RangeParse { .. } => f.write_str("invalid IP prefix range"),
+            Self::AddressFamiltMismatch => f.write_str("mismatched address families"),
         }
     }
 }

src/lib.rs

@@ -39,7 +39,7 @@
 //!
 //! [`bgpq3`]: https://github.com/snar/bgpq3
 //!
-#![doc(html_root_url = "https://docs.rs/prefixset/0.1.0-rc.1")]
+#![doc(html_root_url = "https://docs.rs/prefixset/0.1.0-rc.2")]
 #![warn(missing_docs)]
 
 extern crate ipnet;

src/prefix/ipv4.rs

@@ -1,7 +1,8 @@
+use std::convert::TryFrom;
 use std::fmt;
 use std::str::FromStr;
 
-use ipnet::{Ipv4Net, PrefixLenError};
+use ipnet::{IpNet, Ipv4Net, PrefixLenError};
 
 use crate::error::{Error, Result};
 
@@ -45,6 +46,18 @@ impl FromStr for Ipv4Prefix {
     }
 }
 
+impl TryFrom<IpNet> for Ipv4Prefix {
+    type Error = Error;
+
+    fn try_from(n: IpNet) -> Result<Self> {
+        if let IpNet::V4(ipnet) = n {
+            Ok(ipnet.into())
+        } else {
+            Err(Error::AddressFamiltMismatch)
+        }
+    }
+}
+
 impl fmt::Display for Ipv4Prefix {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.to_ipnet().fmt(f)

src/prefix/ipv6.rs

@@ -1,7 +1,8 @@
+use std::convert::TryFrom;
 use std::fmt;
 use std::str::FromStr;
 
-use ipnet::{Ipv6Net, PrefixLenError};
+use ipnet::{IpNet, Ipv6Net, PrefixLenError};
 
 use crate::error::{Error, Result};
 
@@ -45,6 +46,18 @@ impl FromStr for Ipv6Prefix {
     }
 }
 
+impl TryFrom<IpNet> for Ipv6Prefix {
+    type Error = Error;
+
+    fn try_from(n: IpNet) -> Result<Self> {
+        if let IpNet::V6(ipnet) = n {
+            Ok(ipnet.into())
+        } else {
+            Err(Error::AddressFamiltMismatch)
+        }
+    }
+}
+
 impl fmt::Display for Ipv6Prefix {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.to_ipnet().fmt(f)