@@ -2,12 +2,14 @@ use proc_macro2::{Ident, Span, TokenStream};
2
2
use quote:: { format_ident, quote, quote_spanned, ToTokens } ;
3
3
use syn:: { parse:: Error , parse_quote, punctuated:: Punctuated , GenericArgument , ItemFn , Token } ;
4
4
5
- use crate :: builder_attr:: { IntoSetting , TypeBuilderAttr } ;
6
- use crate :: field_info:: FieldInfo ;
7
- use crate :: mutator:: Mutator ;
8
- use crate :: util:: {
9
- empty_type, empty_type_tuple, first_visibility, modify_types_generics_hack, phantom_data_for_generics, public_visibility,
10
- strip_raw_ident_prefix, type_tuple,
5
+ use crate :: {
6
+ builder_attr:: { IntoSetting , TypeBuilderAttr } ,
7
+ field_info:: FieldInfo ,
8
+ mutator:: Mutator ,
9
+ util:: {
10
+ empty_type, empty_type_tuple, first_visibility, modify_types_generics_hack, phantom_data_for_generics, public_visibility,
11
+ strip_raw_ident_prefix, type_tuple,
12
+ } ,
11
13
} ;
12
14
13
15
#[ derive( Debug ) ]
@@ -305,9 +307,10 @@ impl<'a> StructInfo<'a> {
305
307
} else if strip_option. fallback_prefix . is_none ( ) && strip_option. fallback_suffix . is_none ( ) {
306
308
None
307
309
} else {
310
+ let method = strip_raw_ident_prefix ( field_name. to_string ( ) ) ;
308
311
let prefix = strip_option. fallback_prefix . as_deref ( ) . unwrap_or_default ( ) ;
309
312
let suffix = strip_option. fallback_suffix . as_deref ( ) . unwrap_or_default ( ) ;
310
- let fallback_name = syn:: Ident :: new ( & format ! ( "{}{}{}" , prefix, field_name , suffix) , field_name. span ( ) ) ;
313
+ let fallback_name = syn:: Ident :: new ( & format ! ( "{}{}{}" , prefix, method , suffix) , field_name. span ( ) ) ;
311
314
Some ( ( fallback_name, quote ! ( #field_name: #field_type) , quote ! ( #arg_expr) ) )
312
315
}
313
316
} ) ;
0 commit comments