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

Merge pull request #681 from serde-rs/deserialize_struct_bug

Browse Source 
fix various serde(rename) bugs
This commit is contained in:
David Tolnay
2017-01-13 01:21:46 -08:00
committed by GitHub
parent 766ede965e a07b6bd9e7
commit c008c6d3a8
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/de.rs
+3 -6
View File
@@ -489,7 +489,7 @@ fn deserialize_item_enum(
true,
);
let variant_names = variants.iter().map(|variant| variant.ident.to_string());
let variant_names = variants.iter().map(|variant| variant.attrs.name().deserialize_name());
let variants_stmt = quote! {
const VARIANTS: &'static [&'static str] = &[ #(#variant_names),* ];
@@ -697,9 +697,10 @@ fn deserialize_struct_visitor(
fields: &[Field],
item_attrs: &attr::Item,
) -> (Tokens, Tokens, Tokens) {
let field_exprs = fields.iter()
let field_exprs: Vec<_> = fields.iter()
.map(|field| field.attrs.name().deserialize_name())
.collect();
let field_names = field_exprs.clone();
let field_visitor = deserialize_field_visitor(
field_exprs,
@@ -715,10 +716,6 @@ fn deserialize_struct_visitor(
item_attrs,
);
let field_names = fields.iter().map(|field| {
field.ident.clone().expect("struct contains unnamed field").to_string()
});
let fields_stmt = quote! {
const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
};