@@ -3,9 +3,9 @@ use syn::{DeriveInput, Meta, Type};
33
44use super :: models:: { FieldAttribute , FieldAttributeBuilder , TypeAttributeBuilder } ;
55use crate :: {
6- supported_traits :: Trait , TraitHandler ,
7- common :: field_info :: FieldInfo ,
8- common :: variant_info :: VariantInfo ,
6+ common :: { field_info :: FieldInfo , variant_info :: VariantInfo } ,
7+ supported_traits :: Trait ,
8+ TraitHandler ,
99} ;
1010
1111pub ( crate ) struct CloneDataHandler ;
@@ -92,18 +92,15 @@ impl TraitHandler for CloneDataHandler {
9292 let field_name_src = format_ident ! ( "_s_{}" , field_name_real) ;
9393 let field_name_dst = format_ident ! ( "_d_{}" , field_name_real) ;
9494
95- pattern_src_token_stream
96- . extend ( quote ! ( #field_name_real: #field_name_src, ) ) ;
97- pattern_dst_token_stream
98- . extend ( quote ! ( #field_name_real: #field_name_dst, ) ) ;
95+ pattern_src_token_stream. extend ( quote ! ( #field_name_real: #field_name_src, ) ) ;
96+ pattern_dst_token_stream. extend ( quote ! ( #field_name_real: #field_name_dst, ) ) ;
9997
10098 if let Some ( clone) = field_attribute. method . as_ref ( ) {
10199 cl_fields_token_stream. extend ( quote ! {
102100 #field_name_real: #clone( #field_name_src) ,
103101 } ) ;
104- cf_body_token_stream. extend (
105- quote ! ( * #field_name_dst = #clone( #field_name_src) ; ) ,
106- ) ;
102+ cf_body_token_stream
103+ . extend ( quote ! ( * #field_name_dst = #clone( #field_name_src) ; ) ) ;
107104 } else {
108105 clone_types. push ( & field. ty ) ;
109106
@@ -121,14 +118,14 @@ impl TraitHandler for CloneDataHandler {
121118 } ) ;
122119
123120 clone_from_variants_token_stream. extend ( quote ! {
124- Self #variant_sel { #pattern_dst_token_stream } => {
125- if let Self #variant_sel { #pattern_src_token_stream } = source {
126- #cf_body_token_stream
127- } else {
128- * self = :: core:: clone:: Clone :: clone( source) ;
129- }
130- } ,
131- } ) ;
121+ Self #variant_sel { #pattern_dst_token_stream } => {
122+ if let Self #variant_sel { #pattern_src_token_stream } = source {
123+ #cf_body_token_stream
124+ } else {
125+ * self = :: core:: clone:: Clone :: clone( source) ;
126+ }
127+ } ,
128+ } ) ;
132129 }
133130
134131 if !contains_copy {
0 commit comments