@@ -58,11 +58,9 @@ pub fn add_struct_field(
5858 insert_pos = prev. text_range ( ) . start ( ) . into ( ) ;
5959 }
6060 }
61- } else {
62- if let Some ( prev) = r_curly. prev_token ( ) {
63- if prev. kind ( ) == SyntaxKind :: WHITESPACE && prev. text ( ) . ends_with ( '\n' ) {
64- prefix_newline = false ;
65- }
61+ } else if let Some ( prev) = r_curly. prev_token ( ) {
62+ if prev. kind ( ) == SyntaxKind :: WHITESPACE && prev. text ( ) . ends_with ( '\n' ) {
63+ prefix_newline = false ;
6664 }
6765 }
6866
@@ -111,7 +109,7 @@ pub fn modify_struct_field_type(
111109
112110 let field = field_list
113111 . fields ( )
114- . find ( |f| f. name ( ) . map_or ( false , |n| n. text ( ) == field_name) )
112+ . find ( |f| f. name ( ) . is_some_and ( |n| n. text ( ) == field_name) )
115113 . ok_or_else ( || {
116114 AppError :: General ( format ! (
117115 "Field '{}' not found in struct '{}'" ,
@@ -169,7 +167,7 @@ pub fn add_derive(source: &str, struct_name: &str, derive_trait: &str) -> AppRes
169167 let patch = if needs_comma {
170168 format ! ( ", {}" , derive_trait)
171169 } else {
172- format ! ( "{}" , derive_trait)
170+ derive_trait. to_string ( )
173171 } ;
174172
175173 new_source. insert_str ( insert_pos, & patch) ;
@@ -294,7 +292,7 @@ fn find_struct(file: &SourceFile, name: &str) -> AppResult<ast::Struct> {
294292 file. syntax ( )
295293 . descendants ( )
296294 . filter_map ( ast:: Struct :: cast)
297- . find ( |s| s. name ( ) . map_or ( false , |n| n. text ( ) == name) )
295+ . find ( |s| s. name ( ) . is_some_and ( |n| n. text ( ) == name) )
298296 . ok_or_else ( || AppError :: General ( format ! ( "Struct '{}' not found in source file" , name) ) )
299297}
300298
0 commit comments