Make Clippy happy

trailofbits · Mar 6, 2022 · a312a9c · a312a9c
1 parent ff59f9f
commit a312a9c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/cargo-test-fuzz/src/lib.rs b/cargo-test-fuzz/src/lib.rs
@@ -935,15 +935,18 @@ fn for_each_entry(
             }
             output = true;
         }
-        if let Some(status) = status {
-            if !flags.contains(Flags::RAW) && buffer.is_empty() {
-                println!("{:?}", status);
-            }
-            failure |= !status.success();
-        } else {
-            println!("Timeout");
-            timeout = true;
-        }
+        status.map_or_else(
+            || {
+                println!("Timeout");
+                timeout = true;
+            },
+            |status| {
+                if !flags.contains(Flags::RAW) && buffer.is_empty() {
+                    println!("{:?}", status);
+                }
+                failure |= !status.success();
+            },
+        );
 
         nonempty = true;
     }

diff --git a/internal/src/dirs.rs b/internal/src/dirs.rs
@@ -101,5 +101,5 @@ fn path_from_args_type<T>() -> String {
 
 #[must_use]
 fn path_from_target(krate: &str, target: &str) -> String {
-    krate.replace("-", "_") + "::" + target
+    krate.replace('-', "_") + "::" + target
 }
diff --git a/macro/src/lib.rs b/macro/src/lib.rs
@@ -1026,22 +1026,25 @@ fn args_from_autos(autos: &[Expr]) -> Expr {
 
 fn log(tokens: &TokenStream2) {
     if log_enabled() {
-        if let Some(rustfmt) = find_installed_component("rustfmt") {
-            let mut popen = Exec::cmd(rustfmt)
-                .stdin(Redirection::Pipe)
-                .popen()
-                .expect("`popen` failed");
-            let mut stdin = popen
-                .stdin
-                .take()
-                .expect("Could not take `rustfmt`'s standard input");
-            write!(stdin, "{}", tokens).expect("Could not write to `rustfmt`'s standard input");
-            drop(stdin);
-            let status = popen.wait().expect("`wait` failed");
-            assert!(status.success(), "`rustfmt` failed");
-        } else {
-            println!("{}", tokens);
-        }
+        find_installed_component("rustfmt").map_or_else(
+            || {
+                println!("{}", tokens);
+            },
+            |rustfmt| {
+                let mut popen = Exec::cmd(rustfmt)
+                    .stdin(Redirection::Pipe)
+                    .popen()
+                    .expect("`popen` failed");
+                let mut stdin = popen
+                    .stdin
+                    .take()
+                    .expect("Could not take `rustfmt`'s standard input");
+                write!(stdin, "{}", tokens).expect("Could not write to `rustfmt`'s standard input");
+                drop(stdin);
+                let status = popen.wait().expect("`wait` failed");
+                assert!(status.success(), "`rustfmt` failed");
+            },
+        );
     }
 }