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

UFCS for Option::map and Result::map

Browse Source
This commit is contained in:
David Tolnay
2017-03-18 13:28:42 -07:00
parent d60595cc27
commit 08e2182042
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+11 -8
View File
@@ -272,8 +272,9 @@ fn deserialize_seq(ident: &syn::Ident,
ident, generics, field.ty, path);
quote!({
#wrapper
try!(_serde::de::SeqVisitor::visit::<#wrapper_ty>(&mut __visitor))
.map(|__wrap| __wrap.value)
_serde::export::Option::map(
try!(_serde::de::SeqVisitor::visit::<#wrapper_ty>(&mut __visitor)),
|__wrap| __wrap.value)
})
}
};
@@ -515,10 +516,11 @@ fn deserialize_externally_tagged_enum(ident: &syn::Ident,
// all variants have `#[serde(skip_deserializing)]`.
quote! {
// FIXME: Once we drop support for Rust 1.15:
// let _serde::export::Err(err) = _serde::de::EnumVisitor::visit_variant::<__Field>(__visitor);
// _serde::export::Err(err)
_serde::de::EnumVisitor::visit_variant::<__Field>(__visitor)
.map(|(impossible, _)| match impossible {})
// let _serde::export::Err(__err) = _serde::de::EnumVisitor::visit_variant::<__Field>(__visitor);
// _serde::export::Err(__err)
_serde::export::Result::map(
_serde::de::EnumVisitor::visit_variant::<__Field>(__visitor),
|(__impossible, _)| match __impossible {})
}
} else {
quote! {
@@ -1251,8 +1253,9 @@ fn deserialize_map(ident: &syn::Ident,
quote! {
// FIXME: Once we drop support for Rust 1.15:
// let _serde::export::None::<__Field> = try!(_serde::de::MapVisitor::visit_key(&mut __visitor));
try!(_serde::de::MapVisitor::visit_key::<__Field>(&mut __visitor))
.map(|impossible| match impossible {});
_serde::export::Option::map(
try!(_serde::de::MapVisitor::visit_key::<__Field>(&mut __visitor)),
|__impossible| match __impossible {});
}
} else {
quote! {