refactor: make clippy pedantic

ryanccn · Nov 12, 2023 · a1f786f · a1f786f
1 parent 0df526d
commit a1f786f
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 36 deletions.
diff --git a/src/commands/presence.rs b/src/commands/presence.rs
@@ -18,7 +18,7 @@ pub enum PresenceChoice {
 }
 
 impl PresenceChoice {
-    fn make_activity(&self, content: &str) -> serenity::ActivityData {
+    fn make_activity(self, content: &str) -> serenity::ActivityData {
         match self {
             Self::Custom => serenity::ActivityData::custom(content),
             Self::Playing => serenity::ActivityData::playing(content),

diff --git a/src/commands/shiggy.rs b/src/commands/shiggy.rs
@@ -28,38 +28,42 @@ pub async fn shiggy(
 
     let resp = crate::reqwest_client::HTTP.get(url).send().await?;
 
-    if resp.status().is_success() {
-        let data: SafebooruResponse = resp.json().await?;
-        if !raw {
-            ctx.send(
-                CreateReply::new().embed(
-                    serenity::CreateEmbed::new()
-                        .title(data.id.to_string())
-                        .field("Tags", data.tag_string.replace('_', "\\_"), false)
-                        .field("Source", data.source, false)
-                        .url(format!("https://safebooru.donmai.us/posts/{}", data.id))
-                        .image(data.file_url)
-                        .color(0xfef9c3),
-                ),
-            )
-            .await?;
-        } else {
-            ctx.say(data.file_url).await?;
+    match resp.error_for_status() {
+        Ok(resp) => {
+            let data: SafebooruResponse = resp.json().await?;
+
+            if raw {
+                ctx.say(data.file_url).await?;
+            } else {
+                ctx.send(
+                    CreateReply::new().embed(
+                        serenity::CreateEmbed::new()
+                            .title(data.id.to_string())
+                            .field("Tags", data.tag_string.replace('_', "\\_"), false)
+                            .field("Source", data.source, false)
+                            .url(format!("https://safebooru.donmai.us/posts/{}", data.id))
+                            .image(data.file_url)
+                            .color(0xfef9c3),
+                    ),
+                )
+                .await?;
+            }
         }
-    } else {
-        let mut embed = serenity::CreateEmbed::new()
-            .title("Could not fetch shiggy!")
-            .description("An error occurred while fetching from the API.")
-            .color(0xef4444);
 
-        if let Err(err) = resp.error_for_status_ref().map_err(anyhow::Error::from) {
+        Err(err) => {
+            let err = anyhow::Error::from(err);
             let valfisk_err = ValfiskError::new(&err, &ctx);
             valfisk_err.handle_log();
             valfisk_err.handle_report().await;
-            embed = embed.footer(serenity::CreateEmbedFooter::new(valfisk_err.error_id))
-        };
 
-        ctx.send(CreateReply::new().embed(embed)).await?;
+            let embed = serenity::CreateEmbed::new()
+                .title("Could not fetch shiggy!")
+                .description("An error occurred while fetching from the API.")
+                .color(0xef4444)
+                .footer(serenity::CreateEmbedFooter::new(valfisk_err.error_id));
+
+            ctx.send(CreateReply::new().embed(embed)).await?;
+        }
     }
 
     Ok(())

diff --git a/src/commands/translate.rs b/src/commands/translate.rs
@@ -55,8 +55,7 @@ pub async fn translate(ctx: Context<'_>, message: serenity::Message) -> Result<(
         .sentences
         .into_iter()
         .filter_map(|s| s.trans)
-        .collect::<Vec<String>>()
-        .join("");
+        .collect::<String>();
 
     ctx.send(
         CreateReply::new().embed(

diff --git a/src/handlers/github_expansion.rs b/src/handlers/github_expansion.rs
@@ -37,7 +37,7 @@ pub async fn handle(message: &serenity::Message, ctx: &serenity::Context) -> Res
             .text()
             .await?
             .split('\n')
-            .map(|s| s.to_owned())
+            .map(std::borrow::ToOwned::to_owned)
             .collect();
 
         let idx_start = start - 1;

diff --git a/src/main.rs b/src/main.rs
@@ -1,3 +1,11 @@
+#![warn(clippy::all, clippy::pedantic)]
+#![allow(
+    clippy::unreadable_literal,
+    clippy::module_name_repetitions,
+    clippy::unused_async
+)]
+#![deny(unsafe_code)]
+
 use anyhow::{Context as AnyhowContext, Error, Result};
 use owo_colors::OwoColorize;
 
@@ -19,7 +27,6 @@ mod presence_api;
 mod reqwest_client;
 mod utils;
 
-#[deny(unsafe_code)]
 #[tokio::main]
 async fn main() -> Result<()> {
     #[cfg(debug_assertions)]

diff --git a/src/presence_api.rs b/src/presence_api.rs
@@ -56,9 +56,10 @@ async fn route_get_presence(path: web::Path<(u64,)>) -> Result<impl Responder, A
 }
 
 pub async fn serve() -> anyhow::Result<()> {
-    let host = std::env::var("HOST").unwrap_or(match cfg!(debug_assertions) {
-        true => "127.0.0.1".to_owned(),
-        false => "0.0.0.0".to_owned(),
+    let host = std::env::var("HOST").unwrap_or(if cfg!(debug_assertions) {
+        "127.0.0.1".to_owned()
+    } else {
+        "0.0.0.0".to_owned()
     });
     let port = std::env::var("PORT").map_or(Ok(8080), |v| v.parse::<u16>())?;
 

diff --git a/src/utils/pluralize.rs b/src/utils/pluralize.rs
@@ -10,11 +10,11 @@ pub trait Pluralize {
 
 impl Pluralize for String {
     fn pluralize<T: Integer>(&self, count: T) -> String {
-        self.pluralize_alternate(count, &(self.to_owned() + "s"))
+        self.pluralize_alternate(count, &(self.clone() + "s"))
     }
     fn pluralize_alternate<T: Integer>(&self, count: T, alternate: &str) -> String {
         if count.is_one() {
-            self.to_owned()
+            self.clone()
         } else {
             alternate.to_owned()
         }