Fix clippy warnings

This fixes all clippy warnings on the latest stable: - `cargo 1.67.1 (8ecd4f20a 2023-01-10)` - `clippy 0.1.67 (d5a82bbd 2023-02-07)` Clippy also warned about the `test_bump_*` test cases, where `assert_eq!(true, ...)` and `assert_eq!(false, ...)` are used. I've changed these to `assert!(...)` and `assert!(!...)` respectively.
jaemk · Feb 11, 2023 · bb9d544 · bb9d544
1 parent 69306ee
commit bb9d544
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 43 deletions.
diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-blacklisted-names = ["foo", "baz", "quux"]
+disallowed-names = ["foo", "baz", "quux"]
diff --git a/src/lib.rs b/src/lib.rs
@@ -287,7 +287,7 @@ fn detect_archive(path: &path::Path) -> Result<ArchiveKind> {
         }
         Some(extension) if extension == std::ffi::OsStr::new("gz") => match path
             .file_stem()
-            .map(|e| path::Path::new(e))
+            .map(path::Path::new)
             .and_then(|f| f.extension())
         {
             Some(extension) if extension == std::ffi::OsStr::new("tar") => {
@@ -364,7 +364,7 @@ impl<'a> Extract<'a> {
         let source = fs::File::open(self.source)?;
         let archive = match self.archive {
             Some(archive) => archive,
-            None => detect_archive(&self.source)?,
+            None => detect_archive(self.source)?,
         };
 
         // We cannot use a feature flag in a match arm. To bypass this the code block is
@@ -449,7 +449,7 @@ impl<'a> Extract<'a> {
         let source = fs::File::open(self.source)?;
         let archive = match self.archive {
             Some(archive) => archive,
-            None => detect_archive(&self.source)?,
+            None => detect_archive(self.source)?,
         };
 
         debug!(
@@ -477,7 +477,7 @@ impl<'a> Extract<'a> {
                         .file_name()
                         .ok_or_else(|| Error::Update("Extractor source has no file-name".into()))?;
                     let out_path = into_dir.join(file_name);
-                    let mut out_file = fs::File::create(&out_path)?;
+                    let mut out_file = fs::File::create(out_path)?;
                     io::copy(&mut reader, &mut out_file)?;
                 }
                 #[cfg(feature = "archive-tar")]
@@ -722,7 +722,7 @@ impl Download {
         loop {
             let n = {
                 let buf = src.fill_buf()?;
-                dest.write_all(&buf)?;
+                dest.write_all(buf)?;
                 buf.len()
             };
             if n == 0 {
@@ -848,7 +848,7 @@ mod tests {
             .expect("tempdir fail");
         let out_path = out_tmp.path();
         Extract::from_source(&fp)
-            .extract_into(&out_path)
+            .extract_into(out_path)
             .expect("extract fail");
         let out_file = out_path.join("temp");
         assert!(out_file.exists());
@@ -880,7 +880,7 @@ mod tests {
             .expect("tempdir fail");
         let out_path = out_tmp.path();
         Extract::from_source(&fp)
-            .extract_into(&out_path)
+            .extract_into(out_path)
             .expect("extract fail");
         let out_file = out_path.join("temp.txt");
         assert!(out_file.exists());
@@ -928,7 +928,7 @@ mod tests {
             .expect("tempdir fail");
         let out_path = out_tmp.path();
         Extract::from_source(&fp)
-            .extract_file(&out_path, "renamed_file")
+            .extract_file(out_path, "renamed_file")
             .expect("extract fail");
         let out_file = out_path.join("renamed_file");
         assert!(out_file.exists());
@@ -1002,7 +1002,7 @@ mod tests {
         let out_path = out_tmp.path();
 
         Extract::from_source(&archive_file_path)
-            .extract_into(&out_path)
+            .extract_into(out_path)
             .expect("extract fail");
 
         let out_file = out_path.join("temp.txt");
@@ -1033,14 +1033,14 @@ mod tests {
         let out_path = out_tmp.path();
 
         Extract::from_source(&archive_file_path)
-            .extract_file(&out_path, "temp.txt")
+            .extract_file(out_path, "temp.txt")
             .expect("extract fail");
         let out_file = out_path.join("temp.txt");
         assert!(out_file.exists());
         cmp_content(&out_file, "This is a test!");
 
         Extract::from_source(&archive_file_path)
-            .extract_file(&out_path, "inner_archive/temp2.txt")
+            .extract_file(out_path, "inner_archive/temp2.txt")
             .expect("extract fail");
         let out_file = out_path.join("inner_archive/temp2.txt");
         assert!(out_file.exists());
@@ -1065,11 +1065,11 @@ mod tests {
                 fs::create_dir_all(&tmp_tar_inner_path).expect("Failed to create temp tar path");
 
                 let fp = tmp_tar_path.join("temp.txt");
-                let mut tmp_file = File::create(&fp).expect("temp file create fail");
+                let mut tmp_file = File::create(fp).expect("temp file create fail");
                 tmp_file.write_all(b"This is a test!").unwrap();
 
                 let fp = tmp_tar_inner_path.join("temp2.txt");
-                let mut tmp_file = File::create(&fp).expect("temp file create fail");
+                let mut tmp_file = File::create(fp).expect("temp file create fail");
                 tmp_file.write_all(b"This is a second test!").unwrap();
 
                 let mut ar = tar::Builder::new(vec![]);

diff --git a/src/update.rs b/src/update.rs
@@ -62,9 +62,8 @@ impl Release {
     pub fn asset_for(&self, target: &str) -> Option<ReleaseAsset> {
         self.assets
             .iter()
-            .filter(|asset| asset.name.contains(target))
+            .find(|asset| asset.name.contains(target))
             .cloned()
-            .next()
     }
 }
 
@@ -228,7 +227,7 @@ pub trait ReleaseUpdate {
         print_flush(show_output, "Extracting archive... ")?;
         let bin_path_in_archive = self.bin_path_in_archive();
         Extract::from_source(&tmp_archive_path)
-            .extract_file(&tmp_archive_dir.path(), &bin_path_in_archive)?;
+            .extract_file(tmp_archive_dir.path(), &bin_path_in_archive)?;
         let new_exe = tmp_archive_dir.path().join(&bin_path_in_archive);
 
         // Make executable

diff --git a/src/version.rs b/src/version.rs
@@ -59,43 +59,43 @@ mod test {
 
     #[test]
     fn test_bump_is_compatible() {
-        assert_eq!(false, bump_is_compatible("1.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_compatible("0.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_compatible("1.2.3", "3.3.0").unwrap());
-        assert_eq!(false, bump_is_compatible("1.2.3", "0.2.0").unwrap());
-        assert_eq!(false, bump_is_compatible("0.2.0", "0.3.0").unwrap());
-        assert_eq!(false, bump_is_compatible("0.3.0", "0.2.0").unwrap());
-        assert_eq!(false, bump_is_compatible("1.2.3", "1.1.0").unwrap());
-        assert_eq!(true, bump_is_compatible("1.2.0", "1.2.3").unwrap());
-        assert_eq!(true, bump_is_compatible("0.2.0", "0.2.3").unwrap());
-        assert_eq!(true, bump_is_compatible("1.2.0", "1.3.3").unwrap());
+        assert!(!bump_is_compatible("1.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_compatible("0.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_compatible("1.2.3", "3.3.0").unwrap());
+        assert!(!bump_is_compatible("1.2.3", "0.2.0").unwrap());
+        assert!(!bump_is_compatible("0.2.0", "0.3.0").unwrap());
+        assert!(!bump_is_compatible("0.3.0", "0.2.0").unwrap());
+        assert!(!bump_is_compatible("1.2.3", "1.1.0").unwrap());
+        assert!(bump_is_compatible("1.2.0", "1.2.3").unwrap());
+        assert!(bump_is_compatible("0.2.0", "0.2.3").unwrap());
+        assert!(bump_is_compatible("1.2.0", "1.3.3").unwrap());
     }
 
     #[test]
     fn test_bump_is_major() {
-        assert_eq!(true, bump_is_major("1.2.0", "2.3.1").unwrap());
-        assert_eq!(true, bump_is_major("0.2.0", "2.3.1").unwrap());
-        assert_eq!(true, bump_is_major("1.2.3", "3.3.0").unwrap());
-        assert_eq!(false, bump_is_major("1.2.3", "1.2.0").unwrap());
-        assert_eq!(false, bump_is_major("1.2.3", "0.2.0").unwrap());
+        assert!(bump_is_major("1.2.0", "2.3.1").unwrap());
+        assert!(bump_is_major("0.2.0", "2.3.1").unwrap());
+        assert!(bump_is_major("1.2.3", "3.3.0").unwrap());
+        assert!(!bump_is_major("1.2.3", "1.2.0").unwrap());
+        assert!(!bump_is_major("1.2.3", "0.2.0").unwrap());
     }
 
     #[test]
     fn test_bump_is_minor() {
-        assert_eq!(false, bump_is_minor("1.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_minor("0.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_minor("1.2.3", "3.3.0").unwrap());
-        assert_eq!(true, bump_is_minor("1.2.3", "1.3.0").unwrap());
-        assert_eq!(true, bump_is_minor("0.2.3", "0.4.0").unwrap());
+        assert!(!bump_is_minor("1.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_minor("0.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_minor("1.2.3", "3.3.0").unwrap());
+        assert!(bump_is_minor("1.2.3", "1.3.0").unwrap());
+        assert!(bump_is_minor("0.2.3", "0.4.0").unwrap());
     }
 
     #[test]
     fn test_bump_is_patch() {
-        assert_eq!(false, bump_is_patch("1.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_patch("0.2.0", "2.3.1").unwrap());
-        assert_eq!(false, bump_is_patch("1.2.3", "3.3.0").unwrap());
-        assert_eq!(false, bump_is_patch("1.2.3", "1.2.3").unwrap());
-        assert_eq!(true, bump_is_patch("1.2.0", "1.2.3").unwrap());
-        assert_eq!(true, bump_is_patch("0.2.3", "0.2.4").unwrap());
+        assert!(!bump_is_patch("1.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_patch("0.2.0", "2.3.1").unwrap());
+        assert!(!bump_is_patch("1.2.3", "3.3.0").unwrap());
+        assert!(!bump_is_patch("1.2.3", "1.2.3").unwrap());
+        assert!(bump_is_patch("1.2.0", "1.2.3").unwrap());
+        assert!(bump_is_patch("0.2.3", "0.2.4").unwrap());
     }
 }