From efec43b3b8827820cf35fe1b73d8e33f5fe84eb4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 20 Jun 2026 01:16:50 +0900 Subject: refactor: auto-fix clippy warnings --- crates/shirabe/src/command/exec_command.rs | 32 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'crates/shirabe/src/command/exec_command.rs') diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index aef22a3..c4a1e94 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -26,6 +26,12 @@ pub struct ExecCommand { base_command_data: BaseCommandData, } +impl Default for ExecCommand { + fn default() -> Self { + Self::new() + } +} + impl ExecCommand { pub fn new() -> Self { let mut command = ExecCommand { @@ -61,10 +67,10 @@ impl ExecCommand { let mut binaries: Vec = Vec::new(); let mut previous_bin: Option = None; for bin in bins.iter().chain(local_bins.iter()) { - if let Some(prev) = &previous_bin { - if bin == &format!("{}.bat", prev) { - continue; - } + if let Some(prev) = &previous_bin + && bin == &format!("{}.bat", prev) + { + continue; } previous_bin = Some(bin.clone()); binaries.push(basename(bin)); @@ -201,13 +207,13 @@ impl Command for ExecCommand { // Application handle (deferred with the Application shared-ownership work). Until then the // working-directory restore is skipped. let initial_working_directory: Option = None; - if let Some(ref iwd) = initial_working_directory { - if getcwd().as_deref() != Some(iwd.as_str()) { - chdir(iwd).map_err(|e| RuntimeException { - message: format!("Could not switch back to working directory \"{}\"", iwd), - code: 0, - })?; - } + if let Some(ref iwd) = initial_working_directory + && getcwd().as_deref() != Some(iwd.as_str()) + { + chdir(iwd).map_err(|e| RuntimeException { + message: format!("Could not switch back to working directory \"{}\"", iwd), + code: 0, + })?; } let args = input @@ -221,12 +227,12 @@ impl Command for ExecCommand { }) .unwrap_or_default(); - Ok(dispatcher.borrow_mut().dispatch_script( + dispatcher.borrow_mut().dispatch_script( "__exec_command", true, args, indexmap::IndexMap::new(), - )?) + ) } fn initialize( -- cgit v1.3.1