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

Some refactoring to use a bit less unwrap()

Browse Source
This commit is contained in:
Armin Ronacher
2018-03-20 13:20:56 +01:00
parent 7c596c7136
commit 6e324e887d
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/private/de.rs
+23 -17
View File
@@ -2108,16 +2108,18 @@ impl<'a, 'de, E> Deserializer<'de> for FlatMapDeserializer<'a, 'de, E>
V: Visitor<'de>, V: Visitor<'de>,
{ {
for item in self.0.iter_mut() { for item in self.0.iter_mut() {
if item.is_none() || !item.as_ref().unwrap().0.as_str() let use_item = match *item {
.map_or(false, |x| variants.contains(&x)) { None => false,
continue; Some((ref c, _)) => c.as_str().map_or(false, |x| variants.contains(&x))
} };
let (key, value) = item.take().unwrap(); if use_item {
return visitor.visit_enum(EnumDeserializer::new( let (key, value) = item.take().unwrap();
key, return visitor.visit_enum(EnumDeserializer::new(
Some(value) key,
)); Some(value)
));
}
} }
Err(Error::custom(format_args!( Err(Error::custom(format_args!(
@@ -2197,14 +2199,18 @@ impl<'a, 'de, E> MapAccess<'de> for FlatMapAccess<'a, 'de, E>
T: DeserializeSeed<'de>, T: DeserializeSeed<'de>,
{ {
while let Some(item) = self.iter.next() { while let Some(item) = self.iter.next() {
let use_item = item.is_some() && item.as_ref().unwrap().0.as_str() let use_item = match *item {
.map_or(self.fields.is_none(), |key| { None => false,
match self.fields { Some((ref c, _)) => {
None => true, c.as_str().map_or(self.fields.is_none(), |key| {
Some(fields) if fields.contains(&key) => true, match self.fields {
_ => false None => true,
} Some(fields) if fields.contains(&key) => true,
}); _ => false
}
})
}
};
if use_item { if use_item {
let (key, content) = item.take().unwrap(); let (key, content) = item.take().unwrap();