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

Eliminate collects in codegen for deserializing map

Browse Source
This commit is contained in:
David Tolnay 2017-01-12 21:52:56 -08:00
parent eb5a49e380
commit 766ede965e
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
serde_codegen/src/de.rs
View File

@ -744,21 +744,20 @@ fn deserialize_map(
} }
// Create the field names for the fields. // Create the field names for the fields.
let fields_names = fields.iter() let fields_names: Vec<_> = fields.iter()
.enumerate() .enumerate()
.map(|(i, field)| (field, field_i(i))) .map(|(i, field)| (field, field_i(i)))
.collect::<Vec<_>>(); .collect();
// Declare each field that will be deserialized. // Declare each field that will be deserialized.
let let_values: Vec<_> = fields_names.iter() let let_values = fields_names.iter()
.filter(|&&(field, _)| !field.attrs.skip_deserializing()) .filter(|&&(field, _)| !field.attrs.skip_deserializing())
.map(|&(field, ref name)| { .map(|&(field, ref name)| {
let field_ty = &field.ty; let field_ty = &field.ty;
quote! { quote! {
let mut #name: Option<#field_ty> = None; let mut #name: Option<#field_ty> = None;
} }
}) });
.collect();
// Match arms to extract a value for a field. // Match arms to extract a value for a field.
let value_arms = fields_names.iter() let value_arms = fields_names.iter()
@ -791,8 +790,7 @@ fn deserialize_map(
#name = Some(#visit); #name = Some(#visit);
} }
} }
}) });
.collect::<Vec<_>>();
// Match arms to ignore value for fields that have `skip_deserializing`. // Match arms to ignore value for fields that have `skip_deserializing`.
// Ignored even if `deny_unknown_fields` is set. // Ignored even if `deny_unknown_fields` is set.
@ -804,8 +802,7 @@ fn deserialize_map(
let _ = try!(visitor.visit_value::<_serde::de::impls::IgnoredAny>()); let _ = try!(visitor.visit_value::<_serde::de::impls::IgnoredAny>());
} }
} }
}) });
.collect::<Vec<_>>();
// Visit ignored values to consume them // Visit ignored values to consume them
let ignored_arm = if item_attrs.deny_unknown_fields() { let ignored_arm = if item_attrs.deny_unknown_fields() {
@ -827,8 +824,7 @@ fn deserialize_map(
None => #missing_expr None => #missing_expr
}; };
} }
}) });
.collect::<Vec<_>>();
let result = fields_names.iter() let result = fields_names.iter()
.map(|&(field, ref name)| { .map(|&(field, ref name)| {