From b3449b6b3dddd7d07c03eb15b3a73a108bb794da Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Wed, 17 Jun 2020 19:39:58 +0000 Subject: [PATCH] Make clippy happy --- src/main.rs | 4 ++-- src/presets.rs | 6 ++---- src/process.rs | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 36c7c78..623414a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -225,7 +225,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { packages.extend(presets.packages); - if presets.aur_packages.len() > 0 { + if !presets.aur_packages.is_empty() { packages.extend(constants::AUR_DEPENDENCIES.iter().map(|s| String::from(*s))); } @@ -249,7 +249,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { ); debug!("fstab:\n{}", fstab); fs::write(mount_point.path().join("etc/fstab"), fstab).context("fstab error")?; - if presets.aur_packages.len() > 0 { + if !presets.aur_packages.is_empty() { arch_chroot .execute() .arg(mount_point.path()) diff --git a/src/presets.rs b/src/presets.rs index 5c79e80..c6d9851 100644 --- a/src/presets.rs +++ b/src/presets.rs @@ -22,10 +22,8 @@ fn visit_dirs(dir: &Path, filevec: &mut Vec) -> Result<(), io::Error> { let path = entry.path(); if path.is_dir() { visit_dirs(&path, filevec)?; - } else { - if entry.path().extension() == Some(&std::ffi::OsString::from("toml")) { - filevec.push(entry.path()); - } + } else if entry.path().extension() == Some(&std::ffi::OsString::from("toml")) { + filevec.push(entry.path()); } } } diff --git a/src/process.rs b/src/process.rs index 7331e9f..9178846 100644 --- a/src/process.rs +++ b/src/process.rs @@ -13,7 +13,7 @@ impl CommandExt for Command { let exit_status = self.spawn()?.wait()?; if !exit_status.success() { - Err(anyhow!("Bad exit code: {}", exit_status))?; + return Err(anyhow!("Bad exit code: {}", exit_status)); } Ok(()) @@ -25,7 +25,7 @@ impl CommandExt for Command { if !output.status.success() { let error = str::from_utf8(&output.stderr).unwrap_or("[INVALID UTF8]"); error!("{}", error); - Err(anyhow!("Bad exit code: {}", output.status))?; + return Err(anyhow!("Bad exit code: {}", output.status)); } Ok(String::from(str::from_utf8(&output.stdout).map_err(