From b0bb9f19d8a19c94645799de7f5dfaa138204a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Lled=C3=B3=20Frasquet?= Date: Mon, 12 Jan 2026 13:41:00 +0100 Subject: [PATCH] refactor: consolidate branches --- yazi-actor/src/mgr/rename.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/yazi-actor/src/mgr/rename.rs b/yazi-actor/src/mgr/rename.rs index 1c0a1e72..9193b395 100644 --- a/yazi-actor/src/mgr/rename.rs +++ b/yazi-actor/src/mgr/rename.rs @@ -67,18 +67,18 @@ impl Actor for Rename { return; }; - if opt.force || !maybe_exists(&new).await || provider::must_identical(&old, &new).await { - if conversion_to_dir_requested && target_is_empty { - Self::replace_file_with_dir(old, new).await.ok(); - } else { - Self::r#do(tab, old, new).await.ok(); - } - } else if ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await { - if conversion_to_dir_requested && target_is_empty { - Self::replace_file_with_dir(old, new).await.ok(); - } else { - Self::r#do(tab, old, new).await.ok(); - } + if !opt.force + && maybe_exists(&new).await + && !provider::must_identical(&old, &new).await + && !ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await + { + return; + } + + if conversion_to_dir_requested && target_is_empty { + Self::replace_file_with_dir(old, new).await.ok(); + } else { + Self::r#do(tab, old, new).await.ok(); } }); succ!();