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

Repetition for field visitor arms

Browse Source
This commit is contained in:
David Tolnay 2017-01-09 00:37:37 -08:00
parent 516cc8b04e
commit 1f8b803607
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
serde_codegen/src/de.rs
View File

@ -642,7 +642,7 @@ fn deserialize_field_visitor(
is_variant: bool, is_variant: bool,
) -> Tokens { ) -> Tokens {
// Create the field names for the fields. // Create the field names for the fields.
let field_idents: Vec<_> = (0 .. field_names.len()) let ref field_idents: Vec<_> = (0 .. field_names.len())
.map(|i| aster::id(format!("__field{}", i))) .map(|i| aster::id(format!("__field{}", i)))
.collect(); .collect();
@ -652,16 +652,7 @@ fn deserialize_field_visitor(
Some(quote!(__ignore,)) Some(quote!(__ignore,))
}; };
// Match arms to extract a field from a string let fallthrough_arm = if is_variant {
let str_field_arms: Vec<_> = field_idents.iter().zip(field_names.iter())
.map(|(field_ident, field_name)| {
quote! {
#field_name => { Ok(__Field::#field_ident) }
}
})
.collect();
let fallthrough_str_arm_expr = if is_variant {
quote! { quote! {
Err(_serde::de::Error::unknown_variant(value)) Err(_serde::de::Error::unknown_variant(value))
} }
@ -696,8 +687,10 @@ fn deserialize_field_visitor(
where __E: _serde::de::Error where __E: _serde::de::Error
{ {
match value { match value {
#(#str_field_arms)* #(
_ => #fallthrough_str_arm_expr #field_names => Ok(__Field::#field_idents),
)*
_ => #fallthrough_arm
} }
} }
} }