hash: Distinguish field name from our local variable name

Fixes the analogous bug to #14 with fields called `state`.
magiclen · Jan 8, 2024 · dcad41f · dcad41f
1 parent 1c091e9
commit dcad41f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/trait_handlers/hash/hash_enum.rs b/src/trait_handlers/hash/hash_enum.rs
@@ -1,4 +1,4 @@
-use quote::quote;
+use quote::{format_ident, quote};
 use syn::{Data, DeriveInput, Fields, Ident, Meta, Path, Type};
 
 use super::{
@@ -61,22 +61,23 @@ impl TraitHandler for HashEnumHandler {
                             }
                             .build_from_attributes(&field.attrs, traits)?;
 
-                            let field_name = field.ident.as_ref().unwrap();
+                            let field_name_real = field.ident.as_ref().unwrap();
+                            let field_name_var = format_ident!("v_{}", field_name_real);
 
                             if field_attribute.ignore {
-                                pattern_token_stream.extend(quote!(#field_name: _,));
+                                pattern_token_stream.extend(quote!(#field_name_real: _,));
 
                                 continue;
                             }
 
-                            pattern_token_stream.extend(quote!(#field_name,));
+                            pattern_token_stream.extend(quote!(#field_name_real: #field_name_var,));
 
                             let hash = field_attribute.method.as_ref().unwrap_or_else(|| {
                                 hash_types.push(&field.ty);
                                 &built_in_hash
                             });
 
-                            block_token_stream.extend(quote!( #hash(#field_name, state); ));
+                            block_token_stream.extend(quote!( #hash(#field_name_var, state); ));
                         }
 
                         arms_token_stream.extend(quote! {