From 08c25212aeaebc315076a6ef558ecdfb1f33aba9 Mon Sep 17 00:00:00 2001
From: MedzikUser <nivua1fn@duck.com>
Date: Sun, 3 Apr 2022 21:11:11 +0200
Subject: [PATCH] fix clippy

---
 src/api/client.rs       |  2 +-
 src/api/delete_image.rs |  2 +-
 src/api/get_image.rs    |  2 +-
 src/api/mod.rs          |  7 ++-----
 src/api/rate_limit.rs   |  2 +-
 src/api/upload_image.rs |  6 +++---
 src/cli/clipboard.rs    |  6 ++++--
 src/cli/mod.rs          |  5 ++++-
 src/main.rs             | 15 ++++++++-------
 9 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/api/client.rs b/src/api/client.rs
index 8a8eb70..23534ac 100644
--- a/src/api/client.rs
+++ b/src/api/client.rs
@@ -43,7 +43,7 @@ impl ImgurClient {
                 format!("{path} is not url or file path"),
             );
 
-            Err(anyhow::Error::from(err))?
+            return Err(err.into());
         }
 
         upload_image(self, image).await
diff --git a/src/api/delete_image.rs b/src/api/delete_image.rs
index f5bba00..d207cc1 100644
--- a/src/api/delete_image.rs
+++ b/src/api/delete_image.rs
@@ -28,7 +28,7 @@ pub async fn delete_image(client: &ImgurClient, delete_hash: String) -> Result<(
             format!("server returned non-successful status code = {status}, body = {body}"),
         );
 
-        Err(err)?
+        return Err(err.into());
     }
 
     Ok(())
diff --git a/src/api/get_image.rs b/src/api/get_image.rs
index 6d13ecd..542a91d 100644
--- a/src/api/get_image.rs
+++ b/src/api/get_image.rs
@@ -22,7 +22,7 @@ pub async fn get_image(client: &ImgurClient, image: String) -> Result<ImageInfo,
             format!("server returned non-successful status code = {status}"),
         );
 
-        Err(err)?
+        Err(err.into())
     } else {
         let content: ImageInfo = res.json().await?;
         Ok(content)
diff --git a/src/api/mod.rs b/src/api/mod.rs
index bf08972..6426888 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -15,8 +15,8 @@ pub use upload_image::*;
 
 use std::collections::HashMap;
 
-use reqwest::{Response, Method};
 use anyhow::Error;
+use reqwest::{Method, Response};
 
 // send request to imgur api
 pub async fn send_api_request(
@@ -38,10 +38,7 @@ pub async fn send_api_request(
     // add `Authorization` and `User-Agent` to request
     req = req
         .header("Authorization", format!("Client-ID {}", config.client_id))
-        .header(
-            "User-Agent",
-            format!("Imgur/{:?}", version),
-        );
+        .header("User-Agent", format!("Imgur/{:?}", version));
 
     // if exists add hashmap to request
     if form != None {
diff --git a/src/api/rate_limit.rs b/src/api/rate_limit.rs
index 9efb77e..d1abcee 100644
--- a/src/api/rate_limit.rs
+++ b/src/api/rate_limit.rs
@@ -46,7 +46,7 @@ pub async fn rate_limit(client: &ImgurClient) -> Result<RateLimitInfo, Error> {
             format!("server returned non-successful status code = {status}, body = {body}"),
         );
 
-        Err(err)?
+        Err(err.into())
     } else {
         let content = res.json::<RateLimitInfo>().await?;
         Ok(content)
diff --git a/src/api/upload_image.rs b/src/api/upload_image.rs
index 4ff1dae..b9d8281 100644
--- a/src/api/upload_image.rs
+++ b/src/api/upload_image.rs
@@ -5,7 +5,7 @@ use reqwest::Method;
 
 use super::{client::api_url, send_api_request, ImageInfo, ImgurClient};
 
-pub async fn upload_image(c: &ImgurClient, image: String) -> Result<ImageInfo, Error> {
+pub async fn upload_image(client: &ImgurClient, image: String) -> Result<ImageInfo, Error> {
     // create http form (hashmap)
     let mut form = HashMap::new();
     // insert image to form
@@ -15,7 +15,7 @@ pub async fn upload_image(c: &ImgurClient, image: String) -> Result<ImageInfo, E
     let uri = api_url!("image");
 
     // send request to imgur api
-    let res = send_api_request(&c, Method::POST, uri, Some(form)).await?;
+    let res = send_api_request(client, Method::POST, uri, Some(form)).await?;
 
     // get response http code
     let status = res.status();
@@ -33,7 +33,7 @@ pub async fn upload_image(c: &ImgurClient, image: String) -> Result<ImageInfo, E
             format!("server returned non-successful status code = {status}, body = {body}"),
         );
 
-        Err(err)?
+        Err(err.into())
     } else {
         let content: ImageInfo = res.json().await?;
         Ok(content)
diff --git a/src/cli/clipboard.rs b/src/cli/clipboard.rs
index ddcd70a..6e66671 100644
--- a/src/cli/clipboard.rs
+++ b/src/cli/clipboard.rs
@@ -59,7 +59,7 @@ pub fn set_clipboard(content: String) {
             "command for clipboard not found".magenta()
         );
 
-        return
+        return;
     }
 
     // copy the content (send it to stdin command)
@@ -81,5 +81,7 @@ pub fn set_clipboard(content: String) {
 )))]
 pub fn set_clipboard(content: String) {
     let mut clipboard = arboard::Clipboard::new().unwrap();
-    clipboard.set_text(content).execute(format!("set clipboard to '{content}'"));
+    clipboard
+        .set_text(content)
+        .execute(format!("set clipboard to '{content}'"));
 }
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index db62381..729fc75 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,11 +1,14 @@
+mod parse;
+
 pub mod clipboard;
 pub mod credits;
 pub mod delete_image;
 pub mod info_image;
-pub mod parse;
 pub mod upload_image;
 pub mod webhook;
 
+pub use parse::*;
+
 use chrono::{prelude::DateTime, Utc};
 use colored::Colorize;
 use imgurs::ImageInfo;
diff --git a/src/main.rs b/src/main.rs
index 71d020a..e1d7026 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,18 +1,19 @@
+use imgurs::ImgurClient;
+use simple_logger::SimpleLogger;
+
 mod cli;
 mod config;
 
-use cli::parse::parse;
-use imgurs::ImgurClient;
-
-use simple_logger::SimpleLogger;
-
 #[tokio::main]
 async fn main() {
     SimpleLogger::new().init().expect("init SimpleLogger");
     better_panic::install();
 
+    // parse config file
     let config = config::toml::parse();
-    let client = ImgurClient::new((&config.imgur.id).to_string());
 
-    parse(client).await
+    // create imgur client
+    let client = ImgurClient::new(config.imgur.id);
+
+    cli::parse(client).await
 }