From c7fd5f8ff1cce68774056a0329aeb1a7de27fcb9 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <markus.kohlhase@slowtec.de>
Date: Fri, 15 Sep 2023 15:29:15 +0200
Subject: [PATCH] Fix some clippy lints

---
 src/html_parser/site_logo.rs     | 5 ++---
 src/icon/icon_size/icon_sizes.rs | 4 ++--
 src/icon/icon_size/jpeg.rs       | 8 ++++----
 src/icon/icon_size/mod.rs        | 2 +-
 src/icons.rs                     | 3 +--
 src/manifest.rs                  | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/html_parser/site_logo.rs b/src/html_parser/site_logo.rs
index 8cab121..a8f943d 100644
--- a/src/html_parser/site_logo.rs
+++ b/src/html_parser/site_logo.rs
@@ -41,8 +41,7 @@ pub async fn parse_site_logo(
                 let elem = elem_ref.value();
                 let ancestors = elem_ref
                     .ancestors()
-                    .map(ElementRef::wrap)
-                    .flatten()
+                    .filter_map(ElementRef::wrap)
                     .map(|elem_ref| elem_ref.value())
                     .collect::<Vec<_>>();
 
@@ -119,7 +118,7 @@ pub async fn parse_site_logo(
                 let href = if elem.name() == "svg" {
                     Some(Url::parse(&encode_svg(&elem_ref.html())).unwrap())
                 } else {
-                    elem.attr("src").and_then(|href| url.join(&href).ok())
+                    elem.attr("src").and_then(|href| url.join(href).ok())
                 };
 
                 if let Some(href) = &href {
diff --git a/src/icon/icon_size/icon_sizes.rs b/src/icon/icon_size/icon_sizes.rs
index b74e2d4..e03cf09 100644
--- a/src/icon/icon_size/icon_sizes.rs
+++ b/src/icon/icon_size/icon_sizes.rs
@@ -38,7 +38,7 @@ impl TryFrom<&str> for IconSizes {
     type Error = Box<dyn Error>;
 
     fn try_from(sizes_str: &str) -> Result<Self, Self::Error> {
-        let size_strs = sizes_str.split(" ");
+        let size_strs = sizes_str.split(' ');
 
         let mut sizes = Vec::new();
         for size in size_strs {
@@ -85,7 +85,7 @@ impl IntoIterator for IconSizes {
 
 impl Ord for IconSizes {
     fn cmp(&self, other: &Self) -> Ordering {
-        self.largest().cmp(&other.largest())
+        self.largest().cmp(other.largest())
     }
 }
 
diff --git a/src/icon/icon_size/jpeg.rs b/src/icon/icon_size/jpeg.rs
index 5b768fb..08e44c8 100644
--- a/src/icon/icon_size/jpeg.rs
+++ b/src/icon/icon_size/jpeg.rs
@@ -28,10 +28,10 @@ pub async fn get_jpeg_size<R: AsyncRead + Unpin>(
         let page = marker[1];
 
         //  Check for valid SOFn markers. C4, C8, and CC aren't dimension markers.
-        if (page >= 0xC0 && page <= 0xC3)
-            || (page >= 0xC5 && page <= 0xC7)
-            || (page >= 0xC9 && page <= 0xCB)
-            || (page >= 0xCD && page <= 0xCF)
+        if (0xC0..=0xC3).contains(&page)
+            || (0xC5..=0xC7).contains(&page)
+            || (0xC9..=0xCB).contains(&page)
+            || (0xCD..=0xCF).contains(&page)
         {
             //  Only get outside image size
             if depth == 0 {
diff --git a/src/icon/icon_size/mod.rs b/src/icon/icon_size/mod.rs
index fe8aed5..7dea42b 100644
--- a/src/icon/icon_size/mod.rs
+++ b/src/icon/icon_size/mod.rs
@@ -71,7 +71,7 @@ impl<'de> Deserialize<'de> for IconSize {
     {
         let value: String = Deserialize::deserialize(deserializer)?;
 
-        let mut split = value.split("x");
+        let mut split = value.split('x');
         let width = split
             .next()
             .ok_or(de::Error::custom("expected width"))?
diff --git a/src/icons.rs b/src/icons.rs
index 6842ae8..fb8bc3e 100644
--- a/src/icons.rs
+++ b/src/icons.rs
@@ -129,8 +129,7 @@ impl SiteIcons {
             }
             .boxed_local(),
             async {
-                let manifests =
-                    join_all(manifest_urls.map(|url| SiteIcons::load_manifest(url))).await;
+                let manifests = join_all(manifest_urls.map(SiteIcons::load_manifest)).await;
 
                 LoadedKind::DefaultManifest(
                     manifests
diff --git a/src/manifest.rs b/src/manifest.rs
index 7d43602..013314d 100644
--- a/src/manifest.rs
+++ b/src/manifest.rs
@@ -49,6 +49,6 @@ async fn load_manifest_cached(url: Url) -> Result<Vec<Icon>, String> {
     }))
     .await
     .into_iter()
-    .filter_map(|icon| icon)
+    .flatten()
     .collect())
 }