pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-25 20:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #568 from tbu-/pr_ipaddr_stable

Browse Source 
Allow the use of `IpAddr` implementations on stable
This commit is contained in:
David Tolnay
2016-09-29 08:58:33 -07:00
committed by GitHub
parent 22690cedc2 3920993370
commit 9970084550
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/impls.rs
+1 -1
View File
@@ -809,7 +809,7 @@ map_impl!(
///////////////////////////////////////////////////////////////////////////////
#[cfg(all(feature = "unstable", feature = "std"))]
#[cfg(feature = "std")]
impl Deserialize for net::IpAddr {
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
where D: Deserializer,
serde/src/ser/impls.rs
+2 -5
View File
@@ -640,15 +640,12 @@ impl Serialize for Duration {
///////////////////////////////////////////////////////////////////////////////
#[cfg(all(feature = "std", feature = "unstable"))]
#[cfg(feature = "std")]
impl Serialize for net::IpAddr {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
where S: Serializer,
{
match *self {
net::IpAddr::V4(ref addr) => addr.serialize(serializer),
net::IpAddr::V6(ref addr) => addr.serialize(serializer),
}
self.to_string().serialize(serializer)
}
}