chore: fix clippy warnings

Author: coffeeispower

src/commands.rs

@@ -41,7 +41,7 @@ use crate::entities::FetchError;
 pub fn expect_token() -> String {
     if crate::auth::validate_token() {
         log("Your token is valid!");
-        return crate::auth::get_token().unwrap();
+        crate::auth::get_token().unwrap()
     } else {
         err("Your token is invalid!");
         std::process::exit(1);
@@ -81,21 +81,21 @@ mod tests {
 
     #[test]
     fn log() {
-        let mut out = String::from("✔".green().bold().to_string());
+        let mut out = "✔".green().bold().to_string();
         out.push_str(" Some logs");
         assert_eq!(super::format_log("Some logs"), out)
     }
 
     #[test]
     fn err() {
-        let mut out = String::from("✘".red().bold().to_string());
+        let mut out = "X".red().bold().to_string();
         out.push_str(" Some errors");
         assert_eq!(super::format_err("Some errors"), out)
     }
 
     #[test]
     fn warn() {
-        let mut out = String::from("!".yellow().bold().to_string());
+        let mut out = "!".yellow().bold().to_string();
         out.push_str(" Some warnings");
         assert_eq!(super::format_warn("Some warnings"), out)
     }

src/commands/aboutme.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 #[tracing::instrument]
 pub fn aboutme() {
     let token = super::expect_token();
-    match crate::entities::user::fetch_user(token.clone()) {
+    match crate::entities::user::fetch_user(token) {
         Ok(user) => {
             println!("ID: {}", user.user_id.bright_black());
             println!("Plan: {}", color_plan(user.plan));

src/commands/apps.rs

@@ -4,7 +4,7 @@ use crate::entities::FetchError;
 #[tracing::instrument]
 pub fn apps() {
     let token = super::expect_token();
-    match crate::entities::app::App::fetch_all(token.clone()) {
+    match crate::entities::app::App::fetch_all(token) {
         Ok(apps) => {
             println!("Your apps:");
             for app in apps {

src/commands/commit.rs

@@ -66,10 +66,10 @@ where
             let mut f = File::open(path)?;
 
             f.read_to_end(&mut buffer)?;
-            zip.write_all(&*buffer)?;
+            zip.write_all(&buffer)?;
             buffer.clear();
             println!("{}", "✔".green().bold());
-        } else if name.as_os_str().len() != 0 {
+        } else if !name.as_os_str().is_empty() {
             zip.add_directory(name.to_str().unwrap(), options)?;
         }
     }
@@ -88,7 +88,7 @@ fn zip_dir_to_file(
     }
     let writer = File::create(dst_file).unwrap();
 
-    let walkdir = WalkDir::new(src_dir.to_string());
+    let walkdir = WalkDir::new(src_dir);
     let it = walkdir.into_iter();
 
     zip_dir(

src/commands/init.rs

@@ -1,7 +1,7 @@
 use dialoguer::{theme::ColorfulTheme, Select};
 
 fn vec_from_str(s: String) -> Vec<String> {
-    s.split(",").map(|s| s.trim().into()).collect()
+    s.split(',').map(|s| s.trim().into()).collect()
 }
 
 #[derive(Default)]
@@ -25,7 +25,7 @@ impl App {
     fn get_config(&self) -> String {
         match &self.typ {
             AppTyp::Site => {
-                if self.apt.len() > 0 {
+                if !self.apt.is_empty() {
                     format!(
                         "ID={}\nMAIN={}\nAUTORESTART={}\nRAM={}\nAPT={}\nTYPE=site\nVERSION=latest",
                         self.subdomain,
@@ -42,7 +42,7 @@ impl App {
                 }
             }
             AppTyp::Bot => {
-                if self.apt.len() > 0 {
+                if !self.apt.is_empty() {
                     format!("NAME={}\nAVATAR={}\nMAIN={}\nAUTORESTART={}\nRAM={}\nAPT={}\nTYPE=bot\nVERSION=latest", self.name, self.avatar, self.main, self.autorestart, self.ram, self.apt.join(","))
                 } else {
                     format!("NAME={}\nAVATAR={}\nMAIN={}\nAUTORESTART={}\nRAM={}\nTYPE=bot\nVERSION=latest", self.name,self.avatar, self.main, self.autorestart, self.ram)
@@ -60,7 +60,7 @@ pub fn init() -> std::io::Result<()> {
     let typ = Select::with_theme(&ColorfulTheme::default())
         .with_prompt("Type")
         .default(0)
-        .items(&vec!["Bot", "Site"])
+        .items(&["Bot", "Site"])
         .interact()?;
     let mut app: App = Default::default();
     match typ {
@@ -96,7 +96,7 @@ pub fn init() -> std::io::Result<()> {
         .with_prompt("APT Packages")
         .allow_empty(true)
         .interact_text()?;
-    if apt.len() > 0 {
+    if !apt.is_empty() {
         app.apt = vec_from_str(apt);
     }
     std::fs::write("discloud.config", app.get_config())?;

src/commands/login.rs

@@ -3,7 +3,7 @@ use clap::*;
 pub fn login(matches: &ArgMatches) -> std::io::Result<()> {
     let token = matches.get_one::<String>("token").unwrap().clone();
     if let Err(err) = crate::auth::login(token) {
-        super::err(format!("Couldn't save the token: {}", err.kind().to_string()).as_str());
+        super::err(format!("Couldn't save the token: {}", err.kind()).as_str());
         Err(err)
     } else {
         super::log("Token saved successfully");

src/commands/logs.rs

@@ -6,7 +6,7 @@ pub fn logs() {
     match super::ask_for_app(token.clone(), "show the logs") {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Bounce, "Downloading the logs".into());
-            match crate::entities::app::App::get_logs(token.clone(), app_id) {
+            match crate::entities::app::App::get_logs(token, app_id) {
                 Ok(logs) => {
                     spinner.stop_with_message(logs);
                 }

src/commands/mods/add.rs

@@ -16,7 +16,7 @@ pub fn add(id: u128) {
 
     let moderator = crate::handle_result!(
         Mod::new(
-            token.clone(),
+            token,
             id,
             app_id,
             vec![Feature::SeeLogs, Feature::Status]

src/commands/mods/allow.rs

@@ -16,7 +16,7 @@ pub fn allow(id: u128, features: Vec<Feature>) {
         Some(mut moderator) => {
             let mut feats = moderator.get_features();
             feats.append(&mut features.clone());
-            crate::handle_result!(moderator.set_features(feats, token.clone()), spinner);
+            crate::handle_result!(moderator.set_features(feats, token), spinner);
             spinner.stop_with_message(super::format_log(&format!(
                 "{:?} were added successfully!",
                 features

src/commands/mods/deny.rs

@@ -1,6 +1,6 @@
 use crate::entities::moderator::Feature;
 use spinners::*;
-fn subtract_vecs<T>(v1: &Vec<T>, v2: &Vec<T>) -> Vec<T>
+fn subtract_vecs<T>(v1: &[T], v2: &[T]) -> Vec<T>
 where
     T: Eq + Clone,
 {
@@ -23,7 +23,7 @@ pub fn deny(id: u128, features: Vec<Feature>) {
             crate::handle_result!(
                 moderator.set_features(
                     subtract_vecs(&moderator.get_features(), &features),
-                    token.clone()
+                    token
                 ),
                 spinner
             );