From 9273f3f45f7418e87b6e53baef78612ef0d6c5e7 Mon Sep 17 00:00:00 2001
From: Stephan Sokolow <http://www.ssokolow.com/ContactMe>
Date: Thu, 24 Oct 2019 20:44:39 -0400
Subject: Fix clippy complaints that don't change the semantics

(Clippy also complains about `new()` without `impl Default`)
---
 src/backends/kdialog.rs | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'src/backends/kdialog.rs')

diff --git a/src/backends/kdialog.rs b/src/backends/kdialog.rs
index 153e4c5..34070c4 100644
--- a/src/backends/kdialog.rs
+++ b/src/backends/kdialog.rs
@@ -72,15 +72,13 @@ impl AsRef<KDialog> for KDialog {
 fn require_success(status: process::ExitStatus) -> Result<()> {
     if status.success() {
         Ok(())
-    } else {
-        if let Some(code) = status.code() {
-            match code {
-                CANCEL => Ok(()),
-                _ => Err(Error::from(("kdialog", status))),
-            }
-        } else {
-            Err(Error::from(("kdialog", status)))
+    } else if let Some(code) = status.code() {
+        match code {
+            CANCEL => Ok(()),
+            _ => Err(Error::from(("kdialog", status))),
         }
+    } else {
+        Err(Error::from(("kdialog", status)))
     }
 }
 
@@ -100,17 +98,15 @@ fn get_stdout(output: process::Output) -> Result<Option<String>> {
     if output.status.success() {
         String::from_utf8(output.stdout)
             .map(|s| Some(s.trim_end_matches('\n').to_string()))
-            .map_err(|err| Error::from(err))
-    } else {
-        if let Some(code) = output.status.code() {
-            match code {
-                OK => Ok(None),
-                CANCEL => Ok(None),
-                _ => Err(Error::from(("kdialog", output.status))),
-            }
-        } else {
-            Err(Error::from(("kdialog", output.status)))
+            .map_err(Error::from)
+    } else if let Some(code) = output.status.code() {
+        match code {
+            OK => Ok(None),
+            CANCEL => Ok(None),
+            _ => Err(Error::from(("kdialog", output.status))),
         }
+    } else {
+        Err(Error::from(("kdialog", output.status)))
     }
 }
 
-- 
cgit v1.2.1