pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 03:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict between rename changes and skip changes

Browse Source
This commit is contained in:
David Tolnay
2017-01-13 01:27:07 -08:00
parent 7cc24a43fb
commit 8c49e6d6a5
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/de.rs
+1 -9
View File
@@ -702,20 +702,11 @@ fn deserialize_struct_visitor(
fields: &[Field], fields: &[Field],
item_attrs: &attr::Item, item_attrs: &attr::Item,
) -> (Tokens, Tokens, Tokens) { ) -> (Tokens, Tokens, Tokens) {
<<<<<<< HEAD
let field_names_idents = fields.iter() let field_names_idents = fields.iter()
.enumerate() .enumerate()
.filter(|&(_, field)| !field.attrs.skip_deserializing()) .filter(|&(_, field)| !field.attrs.skip_deserializing())
.map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i))) .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
||||||| merged common ancestors
let field_exprs = fields.iter()
.map(|field| field.attrs.name().deserialize_name())
=======
let field_exprs: Vec<_> = fields.iter()
.map(|field| field.attrs.name().deserialize_name())
>>>>>>> origin/master
.collect(); .collect();
let field_names = field_exprs.clone();
let field_visitor = deserialize_field_visitor( let field_visitor = deserialize_field_visitor(
field_names_idents, field_names_idents,
@@ -731,6 +722,7 @@ fn deserialize_struct_visitor(
item_attrs, item_attrs,
); );
let field_names = fields.iter().map(|field| field.attrs.name().deserialize_name());
let fields_stmt = quote! { let fields_stmt = quote! {
const FIELDS: &'static [&'static str] = &[ #(#field_names),* ]; const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
}; };