Merge pull request #425 from Carbocarde/clippy

Fix cargo clippy warnings and errors

Author: Manishearth

src/project.rs

@@ -353,7 +353,7 @@ impl FuzzProject {
         // Use the user-provided target directory, if provided. Otherwise if building for coverage,
         // use the coverage directory
         if let Some(target_dir) = build.target_dir.as_ref() {
-            return Ok(Some(PathBuf::from(target_dir)));
+            Ok(Some(PathBuf::from(target_dir)))
         } else if build.coverage {
             // To ensure that fuzzing and coverage-output generation can run in parallel, we
             // produce a separate binary for the coverage command.
@@ -387,7 +387,7 @@ impl FuzzProject {
             cmd.arg("--bins");
         }
 
-        if let Some(target_dir) = self.target_dir(&build)? {
+        if let Some(target_dir) = self.target_dir(build)? {
             cmd.arg("--target-dir").arg(target_dir);
         }
 
@@ -756,7 +756,7 @@ impl FuzzProject {
         for corpus in corpora.iter() {
             // _tmp_dir is deleted when it goes of of scope.
             let (mut cmd, _tmp_dir) =
-                self.create_coverage_cmd(coverage, &coverage_out_raw_dir, &corpus.as_path())?;
+                self.create_coverage_cmd(coverage, &coverage_out_raw_dir, corpus.as_path())?;
             eprintln!("Generating coverage data for corpus {:?}", corpus);
             let status = cmd
                 .status()

src/rustc_version.rs

@@ -22,7 +22,7 @@ fn rust_version_string() -> anyhow::Result<String> {
     String::from_utf8(raw_output).context("`rustc --version` returned non-text output somehow")
 }
 
-#[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub struct RustVersion {
     pub major: u32,
     pub minor: u32,
@@ -39,6 +39,12 @@ impl Ord for RustVersion {
     }
 }
 
+impl PartialOrd for RustVersion {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 impl RustVersion {
     pub fn discover() -> anyhow::Result<Self> {
         let version_string = rust_version_string()?;