pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 15:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format with rustfmt 1.0.0-nightly

Browse Source
This commit is contained in:
David Tolnay
2018-11-21 01:13:17 -08:00
parent a8a54c0568
commit 9afc5fef11
12 changed files with 107 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/impls.rs
+9 -19
View File
@@ -874,7 +874,9 @@ where
}
}
let visitor = VecVisitor { marker: PhantomData };
let visitor = VecVisitor {
marker: PhantomData,
};
deserializer.deserialize_seq(visitor)
}
@@ -1425,7 +1427,7 @@ impl<'de> Deserialize<'de> for net::IpAddr {
deserializer.deserialize_str(IpAddrVisitor)
} else {
use lib::net::IpAddr;
deserialize_enum!{
deserialize_enum! {
IpAddr IpAddrKind (V4; b"V4"; 0, V6; b"V6"; 1)
"`V4` or `V6`",
deserializer
@@ -1502,7 +1504,7 @@ impl<'de> Deserialize<'de> for net::SocketAddr {
deserializer.deserialize_str(SocketAddrVisitor)
} else {
use lib::net::SocketAddr;
deserialize_enum!{
deserialize_enum! {
SocketAddr SocketAddrKind (V4; b"V4"; 0, V6; b"V6"; 1)
"`V4` or `V6`",
deserializer
@@ -1602,7 +1604,7 @@ impl<'de> Deserialize<'de> for PathBuf {
// #[derive(Deserialize)]
// #[serde(variant_identifier)]
#[cfg(all(feature = "std", any(unix, windows)))]
variant_identifier!{
variant_identifier! {
OsStringKind (Unix; b"Unix"; 0, Windows; b"Windows"; 1)
"`Unix` or `Windows`",
OSSTR_VARIANTS
@@ -1760,11 +1762,7 @@ where
////////////////////////////////////////////////////////////////////////////////
#[cfg(all(
de_rc_dst,
feature = "rc",
any(feature = "std", feature = "alloc")
))]
#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))]
macro_rules! box_forwarded_impl {
(
$(#[doc = $doc:tt])*
@@ -1785,11 +1783,7 @@ macro_rules! box_forwarded_impl {
};
}
#[cfg(all(
de_rc_dst,
feature = "rc",
any(feature = "std", feature = "alloc")
))]
#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))]
box_forwarded_impl! {
/// This impl requires the [`"rc"`] Cargo feature of Serde.
///
@@ -1801,11 +1795,7 @@ box_forwarded_impl! {
Rc
}
#[cfg(all(
de_rc_dst,
feature = "rc",
any(feature = "std", feature = "alloc")
))]
#[cfg(all(de_rc_dst, feature = "rc", any(feature = "std", feature = "alloc")))]
box_forwarded_impl! {
/// This impl requires the [`"rc"`] Cargo feature of Serde.
///
serde/src/private/ser.rs
+9 -12
View File
@@ -409,10 +409,9 @@ mod content {
}
fn end(mut self) -> Result<M::Ok, M::Error> {
try!(
self.map
.serialize_value(&Content::TupleStruct(self.name, self.fields))
);
try!(self
.map
.serialize_value(&Content::TupleStruct(self.name, self.fields)));
self.map.end()
}
}
@@ -454,10 +453,9 @@ mod content {
}
fn end(mut self) -> Result<M::Ok, M::Error> {
try!(
self.map
.serialize_value(&Content::Struct(self.name, self.fields))
);
try!(self
.map
.serialize_value(&Content::Struct(self.name, self.fields)));
self.map.end()
}
}
@@ -1328,10 +1326,9 @@ where
}
fn end(self) -> Result<(), Self::Error> {
try!(
self.map
.serialize_value(&Content::Struct(self.name, self.fields))
);
try!(self
.map
.serialize_value(&Content::Struct(self.name, self.fields)));
Ok(())
}
}