mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate need for unwrap in deserialize_from_seq

Browse Source
This commit is contained in:
David Tolnay 2017-12-11 18:13:13 -08:00
parent 65104aca9c
commit 13e7bee0e6
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
serde_derive/src/de.rs
View File

@ -616,17 +616,17 @@ fn deserialize_from_seq(
self.dest.#field_name = #default;
}
} else {
let handle_none = quote! {
if visit.is_none() {
let return_invalid_length = quote! {
return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
}
};
let write = match field.attrs.deserialize_with() {
None => {
quote! {
let visit = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
_serde::private::de::DeserializeFromSeed(&mut self.dest.#field_name)));
#handle_none
if let _serde::export::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
_serde::private::de::DeserializeFromSeed(&mut self.dest.#field_name)))
{
#return_invalid_length
}
}
}
Some(path) => {
@ -634,11 +634,14 @@ fn deserialize_from_seq(
params, field.ty, path);
quote!({
#wrapper
let visit = _serde::export::Option::map(
try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)),
|__wrap| __wrap.value);
#handle_none
self.dest.#field_name = visit.unwrap();
match try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)) {
_serde::export::Some(__wrap) => {
self.dest.#field_name = __wrap.value;
}
_serde::export::None => {
#return_invalid_length
}
}
})
}
};