cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix eval order lint in ssz_derive (#1210)

Browse Source
This commit is contained in:
Paul Hauner 2020-05-28 11:37:40 +10:00 committed by GitHub
parent 7d897a0519
commit 5879f84d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
consensus/ssz_derive/src/lib.rs
View File

@ -176,6 +176,7 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
}; };
let mut register_types = vec![]; let mut register_types = vec![];
let mut field_names = vec![];
let mut fixed_decodes = vec![]; let mut fixed_decodes = vec![];
let mut decodes = vec![]; let mut decodes = vec![];
let mut is_fixed_lens = vec![]; let mut is_fixed_lens = vec![];
@ -186,14 +187,18 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
for field in &struct_data.fields { for field in &struct_data.fields {
match &field.ident { match &field.ident {
Some(ref ident) => { Some(ref ident) => {
field_names.push(quote! {
#ident
});
if should_skip_deserializing(field) { if should_skip_deserializing(field) {
// Field should not be deserialized; use a `Default` impl to instantiate. // Field should not be deserialized; use a `Default` impl to instantiate.
decodes.push(quote! { decodes.push(quote! {
#ident: <_>::default() let #ident = <_>::default();
}); });
fixed_decodes.push(quote! { fixed_decodes.push(quote! {
#ident: <_>::default() let #ident = <_>::default();
}); });
} else { } else {
let ty = &field.ty; let ty = &field.ty;
@ -203,11 +208,11 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
}); });
decodes.push(quote! { decodes.push(quote! {
#ident: decoder.decode_next()? let #ident = decoder.decode_next()?;
}); });
fixed_decodes.push(quote! { fixed_decodes.push(quote! {
#ident: decode_field!(#ty) let #ident = decode_field!(#ty);
}); });
is_fixed_lens.push(quote! { is_fixed_lens.push(quote! {
@ -269,9 +274,13 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
}}; }};
} }
#(
#fixed_decodes
)*
Ok(Self { Ok(Self {
#( #(
#fixed_decodes, #field_names,
)* )*
}) })
} else { } else {
@ -283,9 +292,14 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
let mut decoder = builder.build()?; let mut decoder = builder.build()?;
#(
#decodes
)*
Ok(Self { Ok(Self {
#( #(
#decodes, #field_names,
)* )*
}) })
} }