fix: clippy issues

Author: ilyvion

database/src/models/comic.rs

@@ -142,7 +142,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn next_id<'e, 'c: 'e, E>(
@@ -171,7 +170,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn publish_date_by_id<'e, 'c: 'e, E>(
@@ -398,11 +396,7 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|ofl| {
-            ofl.map_or((None, None), |fl| {
-                (fl.first.map(|i| i as u16), fl.last.map(|i| i as u16))
-            })
-        })
+        .map(|ofl| ofl.map_or((None, None), |fl| (fl.first, fl.last)))
     }
 
     pub async fn previous_missing_tagline_by_id<'e, 'c: 'e, E>(
@@ -427,7 +421,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn next_missing_tagline_by_id<'e, 'c: 'e, E>(
@@ -452,7 +445,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     // ---
@@ -476,11 +468,7 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|ofl| {
-            ofl.map_or((None, None), |fl| {
-                (fl.first.map(|i| i as u16), fl.last.map(|i| i as u16))
-            })
-        })
+        .map(|ofl| ofl.map_or((None, None), |fl| (fl.first, fl.last)))
     }
 
     pub async fn previous_missing_title_by_id<'e, 'c: 'e, E>(
@@ -504,7 +492,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn next_missing_title_by_id<'e, 'c: 'e, E>(
@@ -528,7 +515,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     // ---
@@ -567,7 +553,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn previous_missing_items_by_id_and_type<'e, 'c: 'e, E>(
@@ -607,7 +592,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn next_missing_items_by_id_and_type<'e, 'c: 'e, E>(
@@ -647,7 +631,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn last_missing_items_by_type<'e, 'c: 'e, E>(
@@ -684,7 +667,6 @@ impl Comic {
         )
         .fetch_optional(executor)
         .await
-        .map(|i| i.map(|i| i as u16))
     }
 
     pub async fn tagline_by_id<'e, 'c: 'e, E>(executor: E, id: u16) -> sqlx::Result<Option<String>>

database/src/models/item.rs

@@ -34,7 +34,7 @@ impl Item {
             comic_id,
         )
         .fetch(executor)
-        .map_ok(|i| (i.id as u16, i))
+        .map_ok(|i| (i.id, i))
         .try_collect()
         .await
     }
@@ -66,7 +66,7 @@ impl Item {
             "#,
         )
         .fetch(executor)
-        .map_ok(|i| (i.id as u16, i))
+        .map_ok(|i| (i.id, i))
         .try_collect()
         .await
     }
@@ -200,7 +200,7 @@ impl Item {
         .fetch(executor)
         .try_filter_map(|pn| async move {
             if let Some(comic) = pn.comic {
-                Ok(Some((pn.id as u16, comic as u16)))
+                Ok(Some((pn.id, comic)))
             } else {
                 Ok(None)
             }
@@ -241,7 +241,7 @@ impl Item {
         .fetch(executor)
         .try_filter_map(|pn| async move {
             if let Some(comic) = pn.comic {
-                Ok(Some((pn.id as u16, comic as u16)))
+                Ok(Some((pn.id, comic)))
             } else {
                 Ok(None)
             }
@@ -326,7 +326,7 @@ impl Item {
         .fetch(executor)
         .try_filter_map(|pn| async move {
             if let Some(comic) = pn.comic {
-                Ok(Some((pn.id as u16, comic as u16)))
+                Ok(Some((pn.id, comic)))
             } else {
                 Ok(None)
             }
@@ -371,7 +371,7 @@ impl Item {
         .fetch(executor)
         .try_filter_map(|pn| async move {
             if let Some(comic) = pn.comic {
-                Ok(Some((pn.id as u16, comic as u16)))
+                Ok(Some((pn.id, comic)))
             } else {
                 Ok(None)
             }

src/controllers/releases.rs

@@ -116,7 +116,7 @@ pub(crate) async fn get_latest_script_file(file: web::Path<String>) -> Result<Ht
         // Cache wasn't expired, but we still had to fetch the asset
         // which means it was a cache miss, so add the missing asset
         // to the existing cache
-        let mut new_cache = (&**cache).clone();
+        let mut new_cache = (**cache).clone();
         if script_file == ScriptFile::User {
             new_cache.user = Some(asset.clone());
         } else {

src/util.rs

@@ -84,8 +84,8 @@ impl<A, B> Either<A, B> {
     fn project(self: Pin<&mut Self>) -> Either<Pin<&mut A>, Pin<&mut B>> {
         unsafe {
             match self.get_unchecked_mut() {
-                Either::Left(a) => Either::Left(Pin::new_unchecked(a)),
-                Either::Right(b) => Either::Right(Pin::new_unchecked(b)),
+                Self::Left(a) => Either::Left(Pin::new_unchecked(a)),
+                Self::Right(b) => Either::Right(Pin::new_unchecked(b)),
             }
         }
     }