@@ -93,7 +93,10 @@ fn schema_component_name_from_path(schema_path: &TokenStream) -> String {
9393 if segments. last ( ) . is_some_and ( |segment| segment == "Schema" ) && segments. len ( ) > 1 {
9494 format ! ( "{}Schema" , capitalize_first( & segments[ segments. len( ) - 2 ] ) )
9595 } else {
96- segments. last ( ) . cloned ( ) . unwrap_or_else ( || "Schema" . to_string ( ) )
96+ segments
97+ . last ( )
98+ . cloned ( )
99+ . unwrap_or_else ( || "Schema" . to_string ( ) )
97100 }
98101}
99102
@@ -116,7 +119,7 @@ fn has_derive(struct_item: &syn::ItemStruct, derive_name: &str) -> bool {
116119
117120fn build_named_struct_field_assignments (
118121 struct_item : & syn:: ItemStruct ,
119- source_expr : TokenStream ,
122+ source_expr : & TokenStream ,
120123) -> syn:: Result < Vec < TokenStream > > {
121124 let syn:: Fields :: Named ( fields_named) = & struct_item. fields else {
122125 return Err ( syn:: Error :: new_spanned (
@@ -179,7 +182,12 @@ fn build_proxy_to_dto_assignments(struct_item: &syn::ItemStruct) -> syn::Result<
179182 let assignments = fields_named
180183 . named
181184 . iter ( )
182- . filter_map ( |field| field. ident . as_ref ( ) . map ( |ident| quote ! { #ident: proxy. #ident } ) )
185+ . filter_map ( |field| {
186+ field
187+ . ident
188+ . as_ref ( )
189+ . map ( |ident| quote ! { #ident: proxy. #ident } )
190+ } )
183191 . collect ( ) ;
184192
185193 Ok ( assignments)
@@ -222,11 +230,19 @@ fn maybe_generate_same_file_relation_override(
222230 . map_err ( |e| syn:: Error :: new ( proc_macro2:: Span :: call_site ( ) , e. to_string ( ) ) ) ?;
223231 let dto_ident = syn:: Ident :: new ( & dto_name, proc_macro2:: Span :: call_site ( ) ) ;
224232 let wrapper_ident = syn:: Ident :: new (
225- & format ! ( "__Vespera{}{}Relation" , new_type_name, snake_to_pascal_case( field_name) ) ,
233+ & format ! (
234+ "__Vespera{}{}Relation" ,
235+ new_type_name,
236+ snake_to_pascal_case( field_name)
237+ ) ,
226238 proc_macro2:: Span :: call_site ( ) ,
227239 ) ;
228240 let proxy_ident = syn:: Ident :: new (
229- & format ! ( "__Vespera{}{}Proxy" , new_type_name, snake_to_pascal_case( field_name) ) ,
241+ & format ! (
242+ "__Vespera{}{}Proxy" ,
243+ new_type_name,
244+ snake_to_pascal_case( field_name)
245+ ) ,
230246 proc_macro2:: Span :: call_site ( ) ,
231247 ) ;
232248 let schema_ref_name = schema_component_name_from_path ( & rel_info. schema_path ) ;
@@ -248,7 +264,8 @@ fn maybe_generate_same_file_relation_override(
248264 let Some ( model_ty) = related_model_type_from_schema_path ( & rel_info. schema_path ) else {
249265 return Ok ( None ) ;
250266 } ;
251- let from_model_assignments = build_named_struct_field_assignments ( & dto_struct, quote ! { source } ) ?;
267+ let source_expr = quote ! { source } ;
268+ let from_model_assignments = build_named_struct_field_assignments ( & dto_struct, & source_expr) ?;
252269
253270 let mut helper_tokens = Vec :: new ( ) ;
254271
@@ -286,7 +303,7 @@ fn maybe_generate_same_file_relation_override(
286303 } ) ;
287304 }
288305
289- helper_tokens. push ( quote ! {
306+ helper_tokens. push ( quote ! {
290307 impl From <#model_ty> for #dto_ident {
291308 fn from( source: #model_ty) -> Self {
292309 Self {
@@ -308,7 +325,10 @@ fn maybe_generate_same_file_relation_override(
308325 }
309326 } ) ;
310327
311- Ok ( Some ( ( quote ! { #wrapper_ident } , quote ! { #( #helper_tokens) * } ) ) )
328+ Ok ( Some ( (
329+ quote ! { #wrapper_ident } ,
330+ quote ! { #( #helper_tokens) * } ,
331+ ) ) )
312332}
313333
314334/// Generate schema code from a struct with optional field filtering
@@ -586,7 +606,7 @@ pub fn generate_schema_type_code(
586606 {
587607 relation_override_helpers. push ( helper_tokens) ;
588608 ( Box :: new ( override_field_ty) , Some ( rel_info) )
589- } else
609+ } else
590610 // Check for circular references and potentially use inline type
591611 if let Some ( inline_type) = generate_inline_relation_type (
592612 new_type_name,
0 commit comments