chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serde: Simplify Deserializer implementation for ValOrVec

Browse Source
This commit is contained in:
Jonas Platte 2021-02-03 19:27:21 +01:00
parent 891db9083b
commit d8c5c326e6
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ruma-serde/src/urlencoded/de/val_or_vec.rs
View File

@ -36,6 +36,17 @@ impl<T> ValOrVec<T> {
ValOrVec::Vec(vec) => vec.push(new_val), ValOrVec::Vec(vec) => vec.push(new_val),
} }
} }
fn deserialize_val<U, E, F>(self, f: F) -> Result<U, E>
where
F: FnOnce(T) -> Result<U, E>,
E: de::Error,
{
match self {
ValOrVec::Val(val) => f(val),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
}
} }
impl<T> IntoIterator for ValOrVec<T> { impl<T> IntoIterator for ValOrVec<T> {
@ -89,10 +100,7 @@ macro_rules! forward_to_part {
fn $method<V>(self, visitor: V) -> Result<V::Value, Self::Error> fn $method<V>(self, visitor: V) -> Result<V::Value, Self::Error>
where V: de::Visitor<'de> where V: de::Visitor<'de>
{ {
match self { self.deserialize_val(move |val| val.$method(visitor))
ValOrVec::Val(val) => val.$method(visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
)* )*
} }
@ -130,20 +138,14 @@ where
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_enum(name, variants, visitor))
ValOrVec::Val(val) => val.deserialize_enum(name, variants, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
fn deserialize_tuple<V>(self, len: usize, visitor: V) -> Result<V::Value, Self::Error> fn deserialize_tuple<V>(self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_tuple(len, visitor))
ValOrVec::Val(val) => val.deserialize_tuple(len, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
fn deserialize_struct<V>( fn deserialize_struct<V>(
@ -155,10 +157,7 @@ where
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_struct(name, fields, visitor))
ValOrVec::Val(val) => val.deserialize_struct(name, fields, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
fn deserialize_unit_struct<V>( fn deserialize_unit_struct<V>(
@ -169,10 +168,7 @@ where
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_unit_struct(name, visitor))
ValOrVec::Val(val) => val.deserialize_unit_struct(name, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
fn deserialize_tuple_struct<V>( fn deserialize_tuple_struct<V>(
@ -184,10 +180,7 @@ where
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_tuple_struct(name, len, visitor))
ValOrVec::Val(val) => val.deserialize_tuple_struct(name, len, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
fn deserialize_newtype_struct<V>( fn deserialize_newtype_struct<V>(
@ -198,10 +191,7 @@ where
where where
V: de::Visitor<'de>, V: de::Visitor<'de>,
{ {
match self { self.deserialize_val(move |val| val.deserialize_newtype_struct(name, visitor))
ValOrVec::Val(val) => val.deserialize_newtype_struct(name, visitor),
ValOrVec::Vec(_) => Err(de::Error::custom("unsupported value")),
}
} }
forward_to_part! { forward_to_part! {