Skip to content
This repository was archived by the owner on Feb 19, 2026. It is now read-only.

Commit c059540

Browse files
committed
fix: clippy
1 parent 816a04e commit c059540

File tree

3 files changed

+10
-36
lines changed

3 files changed

+10
-36
lines changed

cli/src/fs/moving.rs

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -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
}

cli/src/media/audio.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ async fn transfer_audio_in_directory(
231231
if remove_on_success
232232
&& let Err(e) = {
233233
// Lock only when deleting source
234-
let res = remove_file(&file_path).await;
235-
res
234+
remove_file(&file_path).await
236235
}
237236
{
238237
eprintln!(
@@ -267,12 +266,7 @@ async fn transfer_audio_in_directory(
267266
let mut guard = failures.lock().unwrap();
268267
guard.push(name.to_string());
269268
}
270-
if remove_on_fail
271-
&& let Err(e) = {
272-
let res = remove_file(&file_path).await;
273-
res
274-
}
275-
{
269+
if remove_on_fail && let Err(e) = { remove_file(&file_path).await } {
276270
eprintln!(
277271
"Error deleting failed file: {} - {}",
278272
file_path.display(),

cli/src/media/video.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,7 @@ async fn process_videos_in_directory(
387387
Ok(output) if output.status.success() => {
388388
log::info!("Successfully converted: {}", output_path.display());
389389
success = true;
390-
if remove_original
391-
&& let Err(e) = {
392-
let res = remove_file(&file_path).await;
393-
res
394-
}
395-
{
390+
if remove_original && let Err(e) = { remove_file(&file_path).await } {
396391
eprintln!("Failed to remove original file: {e}");
397392
}
398393
break;

0 commit comments

Comments
 (0)