Auto merge of #568 - Mark-Simulacrum:silence-clippy, r=Mark-Simulacrum

Silence clippy lint

Author: bors

src/lib.rs

@@ -1,9 +1,14 @@
 #![recursion_limit = "256"]
 #![allow(
     clippy::needless_pass_by_value,
+    clippy::wrong_self_convention,
     clippy::new_ret_no_self,
     clippy::too_many_arguments,
-    clippy::redundant_closure
+    clippy::redundant_closure,
+    clippy::unnecessary_wraps,
+    clippy::needless_question_mark,
+    clippy::vec_init_then_push,
+    clippy::upper_case_acronyms
 )]
 
 pub mod actions;

src/main.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::redundant_closure)]
+#![allow(clippy::needless_question_mark)]
 
 use log::info;
 mod cli;

src/report/markdown.rs

@@ -132,7 +132,7 @@ fn render_markdown(context: &ResultsContext) -> Fallible<String> {
                         &mut rendered,
                         "* [{}]({}) (not covered in crater testing)",
                         krate,
-                        crate_to_url(&krate)?
+                        crate_to_url(&krate)
                     )?;
                     for krate in deps {
                         write_crate(&mut rendered, krate, *comparison, true)?;

src/report/mod.rs

@@ -250,8 +250,8 @@ pub fn generate_report<DB: ReadResults>(
             );
 
             Ok(CrateResult {
-                name: crate_to_name(&krate)?,
-                url: crate_to_url(&krate)?,
+                name: crate_to_name(&krate),
+                url: crate_to_url(&krate),
                 status: get_crate_version_status(&index, &krate)
                     .unwrap_or(Some(CrateVersionStatus::MissingFromIndex)),
                 krate: krate.clone(),
@@ -384,8 +384,8 @@ fn gen_retry_list(res: &RawTestResults) -> String {
     out
 }
 
-fn crate_to_name(c: &Crate) -> Fallible<String> {
-    Ok(match *c {
+fn crate_to_name(c: &Crate) -> String {
+    match *c {
         Crate::Registry(ref details) => format!("{}-{}", details.name, details.version),
         Crate::GitHub(ref repo) => {
             if let Some(ref sha) = repo.sha {
@@ -407,11 +407,11 @@ fn crate_to_name(c: &Crate) -> Fallible<String> {
                 utf8_percent_encode(&repo.url, &REPORT_ENCODE_SET).to_string()
             }
         }
-    })
+    }
 }
 
-fn crate_to_url(c: &Crate) -> Fallible<String> {
-    Ok(match *c {
+fn crate_to_url(c: &Crate) -> String {
+    match *c {
         Crate::Registry(ref details) => format!(
             "https://crates.io/crates/{}/{}",
             details.name, details.version
@@ -430,7 +430,7 @@ fn crate_to_url(c: &Crate) -> Fallible<String> {
         ),
         Crate::Path(ref path) => utf8_percent_encode(path, &REPORT_ENCODE_SET).to_string(),
         Crate::Git(ref repo) => repo.url.clone(),
-    })
+    }
 }
 
 fn compare(
@@ -672,7 +672,7 @@ mod tests {
             name: "lazy_static".into(),
             version: "1.0".into(),
         });
-        assert_eq!(crate_to_name(&reg).unwrap(), "lazy_static-1.0".to_string());
+        assert_eq!(crate_to_name(&reg), "lazy_static-1.0".to_string());
 
         let repo = GitHubRepo {
             org: "brson".into(),
@@ -681,7 +681,7 @@ mod tests {
         };
         let gh = Crate::GitHub(repo);
 
-        assert_eq!(crate_to_name(&gh).unwrap(), "brson.hello-rs".to_string());
+        assert_eq!(crate_to_name(&gh), "brson.hello-rs".to_string());
 
         let repo = GitHubRepo {
             org: "brson".into(),
@@ -690,10 +690,7 @@ mod tests {
         };
         let gh = Crate::GitHub(repo);
 
-        assert_eq!(
-            crate_to_name(&gh).unwrap(),
-            "brson.hello-rs.f00".to_string()
-        );
+        assert_eq!(crate_to_name(&gh), "brson.hello-rs.f00".to_string());
     }
 
     #[test]
@@ -736,8 +733,8 @@ mod tests {
             version: "1.0".into(),
         });
         assert_eq!(
-            crate_to_url(&reg).unwrap(),
-            "https://crates.io/crates/lazy_static/1.0".to_string()
+            crate_to_url(&reg),
+            "https://crates.io/crates/lazy_static/1.0"
         );
 
         let repo = GitHubRepo {
@@ -747,10 +744,7 @@ mod tests {
         };
         let gh = Crate::GitHub(repo);
 
-        assert_eq!(
-            crate_to_url(&gh).unwrap(),
-            "https://github.com/brson/hello-rs".to_string()
-        );
+        assert_eq!(crate_to_url(&gh), "https://github.com/brson/hello-rs");
 
         let repo = GitHubRepo {
             org: "brson".into(),
@@ -759,8 +753,8 @@ mod tests {
         };
         let gh = Crate::GitHub(repo);
         assert_eq!(
-            crate_to_url(&gh).unwrap(),
-            "https://github.com/brson/hello-rs/tree/f00".to_string()
+            crate_to_url(&gh),
+            "https://github.com/brson/hello-rs/tree/f00"
         );
     }
 

src/runner/mod.rs

@@ -110,10 +110,14 @@ pub fn run_ex<DB: WriteResults + Sync>(
                 .spawn(move || worker.run())?;
             threads.push(join);
         }
-        let disk_watcher_thread = scope
-            .builder()
-            .name("disk-space-watcher".into())
-            .spawn(|| disk_watcher.run())?;
+        let disk_watcher_thread =
+            scope
+                .builder()
+                .name("disk-space-watcher".into())
+                .spawn(|| {
+                    disk_watcher.run();
+                    Ok(())
+                })?;
 
         let clean_exit = join_threads(threads.drain(..));
         disk_watcher.stop();

src/runner/worker.rs

@@ -171,24 +171,24 @@ impl<'a, DB: WriteResults + Sync> DiskSpaceWatcher<'a, DB> {
         self.stop_send.lock().unwrap().send(()).unwrap();
     }
 
-    pub(super) fn run(&self) -> Fallible<()> {
+    pub(super) fn run(&self) {
         loop {
-            self.check()?;
+            self.check();
             match self.stop_recv.lock().unwrap().recv_timeout(self.interval) {
-                Ok(()) => return Ok(()),
+                Ok(()) => return,
                 Err(RecvTimeoutError::Timeout) => {}
                 Err(RecvTimeoutError::Disconnected) => panic!("disconnected stop channel"),
             }
         }
     }
 
-    fn check(&self) -> Fallible<()> {
+    fn check(&self) {
         let usage = match crate::utils::disk_usage::DiskUsage::fetch() {
             Ok(usage) => usage,
             Err(err) => {
                 // TODO: `current_mount` fails sometimes on Windows with ERROR_DEVICE_NOT_READY.
                 warn!("Failed to check space remaining: {}", err);
-                return Ok(());
+                return;
             }
         };
 
@@ -198,6 +198,5 @@ impl<'a, DB: WriteResults + Sync> DiskSpaceWatcher<'a, DB> {
                 worker.schedule_target_dir_cleanup();
             }
         }
-        Ok(())
     }
 }