From 7d906d7f5436705ec3f2f3f5c4d8629c79f98fde Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Thu, 25 Mar 2021 12:50:07 +0200
Subject: refactor: clean up warnings found by clippy

---
 src/install.rs |  2 +-
 src/libvirt.rs | 15 ++++++---------
 src/sshkeys.rs |  8 ++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/install.rs b/src/install.rs
index e74e6ba..94c703c 100644
--- a/src/install.rs
+++ b/src/install.rs
@@ -116,7 +116,7 @@ pub fn virt_install(args: &VirtInstallArgs, iso: &Path) -> Result<PathBuf, VirtI
         .arg("--noautoconsole")
         .arg("--quiet")
         .output()
-        .map_err(|err| VirtInstallError::Run(err))?;
+        .map_err(VirtInstallError::Run)?;
     if !r.status.success() {
         let stderr = String::from_utf8(r.stderr)?;
         return Err(VirtInstallError::VirtInstallFailed(stderr));
diff --git a/src/libvirt.rs b/src/libvirt.rs
index e65ea1e..b144d11 100644
--- a/src/libvirt.rs
+++ b/src/libvirt.rs
@@ -66,16 +66,13 @@ pub struct Libvirt {
 impl Libvirt {
     pub fn connect(url: &str) -> Result<Self, VirtError> {
         debug!("connecting to libvirtd {}", url);
-        let conn = Connect::open(url).map_err(|err| VirtError::Connect(err))?;
+        let conn = Connect::open(url).map_err(VirtError::Connect)?;
         Ok(Self { conn })
     }
 
     fn get_domains(&self) -> Result<Vec<Domain>, VirtError> {
         debug!("listing all domains");
-        Ok(self
-            .conn
-            .list_all_domains(0)
-            .map_err(|err| VirtError::Domains(err))?)
+        Ok(self.conn.list_all_domains(0).map_err(VirtError::Domains)?)
     }
 
     fn get_domain(&self, name: &str) -> Result<Option<Domain>, VirtError> {
@@ -119,7 +116,7 @@ impl Libvirt {
             let disk = find_iso_xml(&xml);
             let flags =
                 VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_AFFECT_LIVE;
-            if disk.len() > 0 {
+            if disk.is_empty() {
                 domain
                     .detach_device_flags(&disk, flags)
                     .map_err(|err| VirtError::DetachIso(name.to_string(), err))?;
@@ -141,7 +138,7 @@ impl Libvirt {
     }
 
     pub fn start(&self, name: &str) -> Result<(), VirtError> {
-        if let Some(_) = self.get_domain(name)? {
+        if self.get_domain(name)?.is_some() {
             self.trigger_start(name)?;
             wait_for_ssh(name);
         }
@@ -196,7 +193,7 @@ impl Libvirt {
 }
 
 fn get_name(domain: &Domain) -> Result<String, VirtError> {
-    let name = domain.get_name().map_err(|err| VirtError::GetName(err))?;
+    let name = domain.get_name().map_err(VirtError::GetName)?;
     Ok(name)
 }
 
@@ -260,7 +257,7 @@ fn find_iso_xml(xml: &str) -> String {
         }
         let end = end.unwrap();
         let disk = &xml[..end + 7];
-        if let Some(_) = disk.find(".iso") {
+        if disk.contains(".iso") {
             return disk.to_string();
         }
         xml = &xml[end..];
diff --git a/src/sshkeys.rs b/src/sshkeys.rs
index 349cabe..b6a5dd9 100644
--- a/src/sshkeys.rs
+++ b/src/sshkeys.rs
@@ -110,7 +110,7 @@ impl KeyPair {
 
     /// Generate a new key pair of the desired kind.
     pub fn generate(kind: KeyKind) -> Result<Self, KeyError> {
-        let dirname = tempdir().map_err(|err| KeyError::TempDir(err))?;
+        let dirname = tempdir().map_err(KeyError::TempDir)?;
         let private_key = dirname.path().join("key");
         let output = Command::new("ssh-keygen")
             .arg("-f")
@@ -122,7 +122,7 @@ impl KeyPair {
             .arg("-N")
             .arg("")
             .output()
-            .map_err(|err| KeyError::Run(err))?;
+            .map_err(KeyError::Run)?;
 
         if !output.status.success() {
             let stderr = String::from_utf8_lossy(&output.stderr).into_owned();
@@ -178,7 +178,7 @@ impl CaKey {
     ///
     /// Return as a string.
     pub fn certify_host(&self, host_key: &KeyPair, hostname: &str) -> Result<String, KeyError> {
-        let dirname = tempdir().map_err(|err| KeyError::TempDir(err))?;
+        let dirname = tempdir().map_err(KeyError::TempDir)?;
         let ca_key = dirname.path().join("ca");
         let host_key_pub = dirname.path().join("host.pub");
         let cert = dirname.path().join("host-cert.pub");
@@ -196,7 +196,7 @@ impl CaKey {
             .arg(format!("host key for {}", hostname))
             .arg(&host_key_pub)
             .output()
-            .map_err(|err| KeyError::Run(err))?;
+            .map_err(KeyError::Run)?;
 
         if !output.status.success() {
             let stderr = String::from_utf8_lossy(&output.stderr).into_owned();
-- 
cgit v1.2.1