pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-22 06:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Touch up PR 1948

Browse Source
This commit is contained in:
David Tolnay
2021-01-12 13:02:53 -08:00
parent 99d9151ce9
commit 391d3ababf
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/impls.rs
+12 -8
View File
@@ -1260,7 +1260,7 @@ macro_rules! parse_ip_impl {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
if deserializer.is_human_readable() { if deserializer.is_human_readable() {
deserializer.deserialize_str(FromStrVisitor::<$ty>::new($expecting)) deserializer.deserialize_str(FromStrVisitor::new($expecting))
} else { } else {
<[u8; $size]>::deserialize(deserializer).map(<$ty>::from) <[u8; $size]>::deserialize(deserializer).map(<$ty>::from)
} }
@@ -1415,7 +1415,7 @@ macro_rules! parse_socket_impl {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
if deserializer.is_human_readable() { if deserializer.is_human_readable() {
deserializer.deserialize_str(FromStrVisitor::<$ty>::new($expecting)) deserializer.deserialize_str(FromStrVisitor::new($expecting))
} else { } else {
<(_, u16)>::deserialize(deserializer).map(|(ip, port)| $new(ip, port)) <(_, u16)>::deserialize(deserializer).map(|(ip, port)| $new(ip, port))
} }
@@ -1431,7 +1431,6 @@ impl<'de> Deserialize<'de> for net::SocketAddr {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
if deserializer.is_human_readable() { if deserializer.is_human_readable() {
deserializer.deserialize_str(FromStrVisitor::new("socket address")) deserializer.deserialize_str(FromStrVisitor::new("socket address"))
} else { } else {
use lib::net::SocketAddr; use lib::net::SocketAddr;
@@ -2537,14 +2536,19 @@ atomic_impl! {
AtomicI64 AtomicU64 AtomicI64 AtomicU64
} }
#[cfg(feature = "std")] #[cfg(feature = "std")]
struct FromStrVisitor<T>(&'static str, PhantomData<T>); struct FromStrVisitor<T> {
expecting: &'static str,
ty: PhantomData<T>,
}
#[cfg(feature = "std")] #[cfg(feature = "std")]
impl<T> FromStrVisitor<T> { impl<T> FromStrVisitor<T> {
fn new(msg: &'static str) -> Self { fn new(expecting: &'static str) -> Self {
FromStrVisitor(msg, PhantomData) FromStrVisitor {
expecting: expecting,
ty: PhantomData,
}
} }
} }
@@ -2557,7 +2561,7 @@ where
type Value = T; type Value = T;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str(self.0) formatter.write_str(self.expecting)
} }
fn visit_str<E>(self, s: &str) -> Result<Self::Value, E> fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>