Merge pull request #31 from smklein/schemars

Add 'schemars' feature for deriving JSON schema

Cargo.toml

@@ -10,8 +10,14 @@ categories = ["network-programming"]
 readme = "README.md"
 documentation = "https://docs.rs/ipnet"
 
+[features]
+default = []
+# Implements "schemars::JsonSchema". Also implies "serde".
+json = ["serde", "schemars"]
+
 [dependencies]
-serde = { version = "1", features = ["derive"], optional = true }
+serde = { package = "serde", version = "1", features = ["derive"], optional = true }
+schemars = { version = "0.8", optional = true }
 
 [dev-dependencies]
 serde_test = "1"

src/ipnet.rs

@@ -40,6 +40,7 @@ use ipext::{IpAdd, IpSub, IpStep, IpAddrRange, Ipv4AddrRange, Ipv6AddrRange};
 /// assert_eq!(Ok(net.network()), "fd00::".parse());
 /// ```
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[cfg_attr(feature = "json", derive(schemars::JsonSchema))]
 pub enum IpNet {
     V4(Ipv4Net),
     V6(Ipv6Net),
@@ -70,6 +71,7 @@ pub enum IpNet {
 /// assert_eq!(Ok(net.network()), "10.1.1.0".parse());
 /// ```
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[cfg_attr(feature = "json", derive(schemars::JsonSchema))]
 pub struct Ipv4Net {
     addr: Ipv4Addr,
     prefix_len: u8,
@@ -100,6 +102,7 @@ pub struct Ipv4Net {
 /// assert_eq!(Ok(net.network()), "fd00::".parse());
 /// ```
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[cfg_attr(feature = "json", derive(schemars::JsonSchema))]
 pub struct Ipv6Net {
     addr: Ipv6Addr,
     prefix_len: u8,

src/ipnet_serde.rs

@@ -2,7 +2,7 @@ use {IpNet, Ipv4Net, Ipv6Net};
 use std::fmt;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use serde::{self, Serialize, Deserialize, Serializer, Deserializer};
-use serde::ser::{SerializeTuple};
+use serde::ser::SerializeTuple;
 use serde::de::{EnumAccess, Error, VariantAccess, Visitor};
 
 impl Serialize for IpNet {
@@ -53,7 +53,7 @@ impl<'de> Deserialize<'de> for IpNet {
                 V4,
                 V6,
             }
-            
+
             impl<'de> Visitor<'de> for EnumVisitor {
                 type Value = IpNet;
 
@@ -64,7 +64,7 @@ impl<'de> Deserialize<'de> for IpNet {
                 fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
                     where A: EnumAccess<'de>
                 {
-                    match try!(data.variant()) {
+                    match data.variant()? {
                         (IpNetKind::V4, v) => v.newtype_variant().map(IpNet::V4),
                         (IpNetKind::V6, v) => v.newtype_variant().map(IpNet::V6),
                     }
@@ -196,7 +196,7 @@ mod tests {
             Token::TupleEnd,
         ]);
     }
-    
+
     #[test]
     fn test_serialize_ipnet_v6() {
         let net_str = "fd00::/32";
@@ -225,7 +225,7 @@ mod tests {
             Token::U8(0),
             Token::U8(32),
             Token::TupleEnd,
-        ]); 
+        ]);
     }
 
     #[test]
@@ -273,4 +273,4 @@ mod tests {
             Token::TupleEnd,
         ]);
     }
-}
+}

src/lib.rs

@@ -79,7 +79,6 @@
 //! [feature]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section
 
 #[cfg(feature = "serde")]
-#[macro_use]
 extern crate serde;
 
 pub use self::ipext::{IpAdd, IpSub, IpBitAnd, IpBitOr, IpAddrRange, Ipv4AddrRange, Ipv6AddrRange};