From ceba74870e237d22b2b28228cb1b35015b21d046 Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Fri, 6 Oct 2023 22:10:42 +1000
Subject: [PATCH] Fix clippy errors in cargo v1.73.0 (#1439)

It actually improves the quality of our code!

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .../src/download/extracted_files.rs                    |  2 +-
 .../binstalk-downloader/src/download/zip_extraction.rs | 10 +++++-----
 crates/binstalk-downloader/src/remote/resolver.rs      |  7 +++++--
 crates/binstalk-fetchers/src/gh_crate_meta/hosting.rs  |  4 ++--
 crates/binstalk-types/src/crate_info.rs                |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/crates/binstalk-downloader/src/download/extracted_files.rs b/crates/binstalk-downloader/src/download/extracted_files.rs
index 87074e00..bf4c0f8a 100644
--- a/crates/binstalk-downloader/src/download/extracted_files.rs
+++ b/crates/binstalk-downloader/src/download/extracted_files.rs
@@ -16,7 +16,7 @@ impl ExtractedFilesEntry {
         ExtractedFilesEntry::Dir(Box::new(
             file_name
                 .map(|file_name| HashSet::from([file_name.into()]))
-                .unwrap_or_else(HashSet::default),
+                .unwrap_or_default(),
         ))
     }
 }
diff --git a/crates/binstalk-downloader/src/download/zip_extraction.rs b/crates/binstalk-downloader/src/download/zip_extraction.rs
index 7242626c..b545ae14 100644
--- a/crates/binstalk-downloader/src/download/zip_extraction.rs
+++ b/crates/binstalk-downloader/src/download/zip_extraction.rs
@@ -201,13 +201,13 @@ fn check_filename_and_normalize(filename: &ZipString) -> Result<(PathBuf, bool),
         .unwrap_or_else(|_| String::from_utf8_lossy(filename.as_bytes()));
 
     let bail = |filename: Cow<'_, str>| {
-        Err(ZipError(ZipErrorInner::InvalidFilePath(
-            filename.into_owned().into(),
+        Err(DownloadError::from(ZipError(
+            ZipErrorInner::InvalidFilePath(filename.into_owned().into()),
         )))
     };
 
     if filename.contains('\0') {
-        return bail(filename)?;
+        return bail(filename);
     }
 
     let mut path = PathBuf::new();
@@ -216,13 +216,13 @@ fn check_filename_and_normalize(filename: &ZipString) -> Result<(PathBuf, bool),
     // `normalize_path::NormalizePath::normalize`.
     for component in Path::new(&*filename).components() {
         match component {
-            Component::Prefix(_) | Component::RootDir => return bail(filename)?,
+            Component::Prefix(_) | Component::RootDir => return bail(filename),
             Component::CurDir => (),
             Component::ParentDir => {
                 if !path.pop() {
                     // `PathBuf::pop` returns false if there is no parent.
                     // which means the path is invalid.
-                    return bail(filename)?;
+                    return bail(filename);
                 }
             }
             Component::Normal(c) => path.push(c),
diff --git a/crates/binstalk-downloader/src/remote/resolver.rs b/crates/binstalk-downloader/src/remote/resolver.rs
index 755bf431..67d95ba1 100644
--- a/crates/binstalk-downloader/src/remote/resolver.rs
+++ b/crates/binstalk-downloader/src/remote/resolver.rs
@@ -3,10 +3,13 @@ use std::{net::SocketAddr, sync::Arc};
 use hyper::client::connect::dns::Name;
 use once_cell::sync::OnceCell;
 use reqwest::dns::{Addrs, Resolve};
-use tracing::{debug, info, instrument, trace, warn};
+use tracing::{info, instrument, warn};
+use trust_dns_resolver::TokioAsyncResolver;
+
+#[cfg(windows)]
+use tracing::{debug, trace};
 #[cfg(windows)]
 use trust_dns_resolver::config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts};
-use trust_dns_resolver::TokioAsyncResolver;
 
 type BoxError = Box<dyn std::error::Error + Send + Sync>;
 
diff --git a/crates/binstalk-fetchers/src/gh_crate_meta/hosting.rs b/crates/binstalk-fetchers/src/gh_crate_meta/hosting.rs
index 779208f9..db8652a9 100644
--- a/crates/binstalk-fetchers/src/gh_crate_meta/hosting.rs
+++ b/crates/binstalk-fetchers/src/gh_crate_meta/hosting.rs
@@ -63,8 +63,8 @@ impl RepositoryHost {
         match repo.domain() {
             Some(domain) if domain.starts_with("github") => GitHub,
             Some(domain) if domain.starts_with("gitlab") => GitLab,
-            Some(domain) if domain == "bitbucket.org" => BitBucket,
-            Some(domain) if domain == "sourceforge.net" => SourceForge,
+            Some("bitbucket.org") => BitBucket,
+            Some("sourceforge.net") => SourceForge,
             _ => Unknown,
         }
     }
diff --git a/crates/binstalk-types/src/crate_info.rs b/crates/binstalk-types/src/crate_info.rs
index eb28750e..9d46d82e 100644
--- a/crates/binstalk-types/src/crate_info.rs
+++ b/crates/binstalk-types/src/crate_info.rs
@@ -41,7 +41,7 @@ impl Eq for CrateInfo {}
 
 impl PartialOrd for CrateInfo {
     fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        self.name.partial_cmp(&other.name)
+        Some(self.cmp(other))
     }
 }