@@ -251,10 +251,7 @@ async fn process_directory(
251251
252252 // Stage 2a: directory direct moves (streamed parallel)
253253 stream:: iter ( dir_direct_moves)
254- . map ( |( src, dst) | async move {
255- let r = fs:: rename ( & src, & dst) . await . map ( |_| ( ) ) ;
256- r
257- } )
254+ . map ( |( src, dst) | async move { fs:: rename ( & src, & dst) . await . map ( |_| ( ) ) } )
258255 . buffer_unordered ( 64 )
259256 . try_for_each ( |_| async { Ok ( ( ) ) } )
260257 . await ?;
@@ -278,10 +275,7 @@ async fn process_directory(
278275
279276 // Stage 2c: file Rename actions (streamed parallel)
280277 stream:: iter ( file_rename_ops)
281- . map ( |( src, dst) | async move {
282- let r = move_file_rename ( & src, & dst) . await . map ( |_| ( ) ) ;
283- r
284- } )
278+ . map ( |( src, dst) | async move { move_file_rename ( & src, & dst) . await . map ( |_| ( ) ) } )
285279 . buffer_unordered ( 128 )
286280 . try_for_each ( |_| async { Ok ( ( ) ) } )
287281 . await ?;
@@ -291,10 +285,7 @@ async fn process_directory(
291285 stream:: iter ( file_replace_ops)
292286 . map ( |( src, dst) | {
293287 let rep = rep_clone2. clone ( ) ;
294- async move {
295- let r = move_file ( & src, & dst, & rep) . await . map ( |_| ( ) ) ;
296- r
297- }
288+ async move { move_file ( & src, & dst, & rep) . await . map ( |_| ( ) ) }
298289 } )
299290 . buffer_unordered ( 128 )
300291 . try_for_each ( |_| async { Ok ( ( ) ) } )
@@ -311,30 +302,24 @@ async fn move_file(src: &Path, dst: &Path, rep: &ReplaceOptions) -> io::Result<(
311302 let action = rep. for_path ( src) ;
312303
313304 match action {
314- ReplaceAction :: Replace => {
315- let r = fs:: rename ( src, dst) . await ;
316- r
317- }
305+ ReplaceAction :: Replace => fs:: rename ( src, dst) . await ,
318306 ReplaceAction :: Skip => {
319307 let exists = fs:: metadata ( & dst) . await . is_ok ( ) ;
320308 if exists {
321309 return Ok ( ( ) ) ;
322310 }
323- let r = fs:: rename ( src, dst) . await ;
324- r
311+ fs:: rename ( src, dst) . await
325312 }
326313 ReplaceAction :: Rename => move_file_rename ( src, dst) . await ,
327314 ReplaceAction :: CheckReplace => {
328315 let dst_exists = fs:: metadata ( & dst) . await . is_ok ( ) ;
329316 if !dst_exists {
330- let r = fs:: rename ( src, dst) . await ;
331- r
317+ fs:: rename ( src, dst) . await
332318 } else {
333319 let same = is_file_same_content ( src, dst) . await ?;
334320 if same {
335321 // Same content, directly overwrite
336- let r = fs:: rename ( src, dst) . await ;
337- r
322+ fs:: rename ( src, dst) . await
338323 } else {
339324 move_file_rename ( src, dst) . await
340325 }
0 commit comments