@@ -51,14 +51,14 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
5151 Some ( field) => {
5252 let field_name = field. name ( ) ?;
5353 let field_ty = field. ty ( ) ?;
54- ( format ! ( "{field_name}" ) , field_ty, field. syntax ( ) . text_range ( ) )
54+ ( format ! ( "{}" , field_name ) , field_ty, field. syntax ( ) . text_range ( ) )
5555 }
5656 None => {
5757 let field = ctx. find_node_at_offset :: < ast:: TupleField > ( ) ?;
5858 let field_list = ctx. find_node_at_offset :: < ast:: TupleFieldList > ( ) ?;
5959 let field_list_index = field_list. fields ( ) . position ( |it| it == field) ?;
6060 let field_ty = field. ty ( ) ?;
61- ( format ! ( "{field_list_index}" ) , field_ty, field. syntax ( ) . text_range ( ) )
61+ ( format ! ( "{}" , field_list_index ) , field_ty, field. syntax ( ) . text_range ( ) )
6262 }
6363 } ;
6464
@@ -77,13 +77,11 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
7777 for method in methods {
7878 let adt = ast:: Adt :: Struct ( strukt. clone ( ) ) ;
7979 let name = method. name ( ctx. db ( ) ) . to_string ( ) ;
80- let impl_def = find_struct_impl ( ctx, & adt, & name) . flatten ( ) ;
81- let method_name = method. name ( ctx. db ( ) ) ;
82-
80+ let impl_def = find_struct_impl ( ctx, & adt, vec ! [ name] ) . flatten ( ) ;
8381 acc. add_group (
8482 & GroupLabel ( "Generate delegate methods…" . to_owned ( ) ) ,
8583 AssistId ( "generate_delegate_methods" , AssistKind :: Generate ) ,
86- format ! ( "Generate delegate for `{field_name }.{method_name }()`" ) ,
84+ format ! ( "Generate delegate for `{}.{}()`" , field_name , method . name ( ctx . db ( ) ) ) ,
8785 target,
8886 |builder| {
8987 // Create the function
@@ -153,12 +151,12 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
153151 Some ( cap) => {
154152 let offset = strukt. syntax ( ) . text_range ( ) . end ( ) ;
155153 let snippet = render_snippet ( cap, impl_def. syntax ( ) , cursor) ;
156- let snippet = format ! ( "\n \n {snippet}" ) ;
154+ let snippet = format ! ( "\n \n {}" , snippet ) ;
157155 builder. insert_snippet ( cap, offset, snippet) ;
158156 }
159157 None => {
160158 let offset = strukt. syntax ( ) . text_range ( ) . end ( ) ;
161- let snippet = format ! ( "\n \n {impl_def}" ) ;
159+ let snippet = format ! ( "\n \n {}" , impl_def . syntax ( ) ) ;
162160 builder. insert ( offset, snippet) ;
163161 }
164162 }
0 commit comments