From 61645421834a616d6d4d21202c8e9fcb5a11e3d4 Mon Sep 17 00:00:00 2001 From: SkyfallWasTaken Date: Mon, 15 Jul 2024 18:26:53 +0100 Subject: [PATCH] Placate Clippy --- crates/dinopkg-cli/src/command/init.rs | 5 +---- crates/dinopkg-cli/src/command/run.rs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/dinopkg-cli/src/command/init.rs b/crates/dinopkg-cli/src/command/init.rs index a5cd110..5721b6c 100644 --- a/crates/dinopkg-cli/src/command/init.rs +++ b/crates/dinopkg-cli/src/command/init.rs @@ -11,9 +11,7 @@ pub async fn init() -> Result<()> { let current_dir_name = current_dir.file_name().unwrap_or("package"); // FIXME: this blocks the event loop let git_config_file = GitConfigFile::from_git_dir(current_dir.join(".git").into()); - let git_repo_url = git_config_file - .and_then(|config| { - Ok(config + let git_repo_url = git_config_file.map(|config| config .section("remote", Some("origin".into())) .ok() .and_then(|remote_section| { @@ -22,7 +20,6 @@ pub async fn init() -> Result<()> { .value("url") .map(|url| url.to_string()) })) - }) .ok() .flatten() .map(|url| url.replace("git@github.com", "https://github.com/")); diff --git a/crates/dinopkg-cli/src/command/run.rs b/crates/dinopkg-cli/src/command/run.rs index c894054..c439a6f 100644 --- a/crates/dinopkg-cli/src/command/run.rs +++ b/crates/dinopkg-cli/src/command/run.rs @@ -18,7 +18,7 @@ pub async fn run(script_name: Option) -> Result<()> { println!("{} {}", "$".purple().dimmed(), script.bold().dimmed()); let status = - run_script(DEFAULT_SHELL, DEFAULT_SHELL_EXEC_ARG, &script, root_path) + run_script(DEFAULT_SHELL, DEFAULT_SHELL_EXEC_ARG, script, root_path) .await?; if cfg!(unix) {