Kieran/ipnetwork
1
0
Fork 0
mirror of https://github.com/achanda/ipnetwork.git synced 2025-06-15 16:43:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove serde feature flag

Browse Source
This commit is contained in:
sharks
2018-04-17 19:28:38 -05:00
parent de707e35ae
commit c6ead9d654
6 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -11,7 +11,7 @@ env:
matrix:
include:
- rust: nightly
env: FEATURES=ipv6-iterator,ipv6-methods,serde,serde-derive
env: FEATURES=ipv6-iterator,ipv6-methods
script:
- cargo build --features $FEATURES --verbose

4
Cargo.toml
View File

@ -12,8 +12,8 @@ categories = ["network-programming", "os"]
[dependencies]
clippy = {version = "0.0.104", optional = true}
serde = { version = ">=0.8.0, <2.0", optional = true }
serde_derive = { version = ">=0.8.0, <2.0", optional = true }
serde = ">=0.8.0, <2.0"
serde_derive = ">=0.8.0, <2.0"
[dev-dependencies]
serde_json = "1.0"

3
src/ipv4.rs
View File

@ -2,7 +2,6 @@ use std::fmt;
use std::net::Ipv4Addr;
use std::str::FromStr;
#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use common::{cidr_parts, parse_addr, parse_prefix, IpNetworkError};
@ -16,7 +15,6 @@ pub struct Ipv4Network {
prefix: u8,
}
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Ipv4Network {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
@ -27,7 +25,6 @@ impl<'de> Deserialize<'de> for Ipv4Network {
}
}
#[cfg(feature = "serde")]
impl Serialize for Ipv4Network {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where

3
src/ipv6.rs
View File

@ -3,7 +3,6 @@ use std::fmt;
use std::net::Ipv6Addr;
use std::str::FromStr;
#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use common::{cidr_parts, parse_prefix, IpNetworkError};
@ -18,7 +17,6 @@ pub struct Ipv6Network {
prefix: u8,
}
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Ipv6Network {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
@ -29,7 +27,6 @@ impl<'de> Deserialize<'de> for Ipv6Network {
}
}
#[cfg(feature = "serde")]
impl Serialize for Ipv6Network {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where

7
src/lib.rs
View File

@ -8,9 +8,7 @@
#![crate_type = "lib"]
#![doc(html_root_url = "https://docs.rs/ipnetwork/0.12.8")]
#[cfg(feature = "serde")]
extern crate serde;
#[cfg(feature = "serde")]
#[macro_use]
extern crate serde_derive;
@ -29,9 +27,8 @@ pub use ipv6::{ipv6_mask_to_prefix, Ipv6Network};
/// Represents a generic network range. This type can have two variants:
/// the v4 and the v6 case.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(untagged))]
#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord)]
#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
#[serde(untagged)]
pub enum IpNetwork {
V4(Ipv4Network),
V6(Ipv6Network),

8
tests/test_json.rs
View File

@ -1,8 +1,7 @@
#[cfg(feature = "serde")]
extern crate serde;
#[cfg(feature = "serde")]
extern crate serde_json;
#[cfg(feature = "serde")]
#[macro_use]
extern crate serde_derive;
@ -14,7 +13,6 @@ mod tests {
use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
use std::net::{Ipv4Addr, Ipv6Addr};
#[cfg(feature = "serde")]
#[test]
fn test_ipv4_json() {
let json_string = r#"{"ipnetwork":"127.1.0.0/24"}"#;
@ -32,7 +30,6 @@ mod tests {
assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string);
}
#[cfg(feature = "serde")]
#[test]
fn test_ipv6_json() {
let json_string = r#"{"ipnetwork":"::1/0"}"#;
@ -53,7 +50,6 @@ mod tests {
assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string);
}
#[cfg(feature = "serde")]
#[test]
fn test_ipnetwork_json() {
let json_string = r#"{"ipnetwork":["127.1.0.0/24","::1/0"]}"#;