Skip to content

Commit

Permalink
format code, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
magiclen committed Sep 8, 2023
1 parent e985a2b commit 79936fe
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cidr-utils"
version = "0.5.10"
version = "0.5.11"
authors = ["Magic Len <len@magiclen.org>"]
edition = "2021"
rust-version = "1.58"
Expand Down
23 changes: 11 additions & 12 deletions src/cidr/ip_cidr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ use std::{
str::FromStr,
};

#[cfg(feature = "serde")]
use serde::de::{Deserialize, Deserializer, Error as DeError, Visitor};
#[cfg(feature = "serde")]
use serde::ser::{Serialize, Serializer};

use super::{IpCidrError, Ipv4Cidr, Ipv4CidrError, Ipv6Cidr, Ipv6CidrError};
use crate::num_bigint::BigUint;

Expand Down Expand Up @@ -206,18 +211,12 @@ impl TryFrom<&str> for IpCidr {
}
}


#[cfg(feature = "serde")]
use serde::de::{Deserialize, Deserializer, Error as DeError, Visitor};
#[cfg(feature = "serde")]
use serde::ser::{Serialize, Serializer};

#[cfg(feature = "serde")]
impl Serialize for IpCidr {
#[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer, {
where
S: Serializer, {
serializer.serialize_str(self.to_string().as_str())
}
}
Expand All @@ -226,8 +225,8 @@ impl Serialize for IpCidr {
impl<'de> Deserialize<'de> for IpCidr {
#[inline]
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>, {
where
D: Deserializer<'de>, {
struct IpVisitor;

impl<'de> Visitor<'de> for IpVisitor {
Expand All @@ -240,8 +239,8 @@ impl<'de> Deserialize<'de> for IpCidr {

#[inline]
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where
E: DeError, {
where
E: DeError, {
IpCidr::from_str(v).map_err(DeError::custom)
}
}
Expand Down

0 comments on commit 79936fe

Please sign in to comment.