Fix clippy lints

Author: kangalio

src/command_history.rs

@@ -28,7 +28,7 @@ pub(crate) fn replay_message(
         let mut msg = CustomMessage::new();
         msg.id(ev.id)
             .channel_id(ev.channel_id)
-            .content(ev.content.unwrap_or_else(|| String::new()));
+            .content(ev.content.unwrap_or_else(String::new));
 
         let msg = msg.build();
 
@@ -49,7 +49,7 @@ pub(crate) fn clear_command_history(cx: &Context) -> Result<(), SendSyncError> {
     let history = data.get_mut::<CommandHistory>().unwrap();
 
     // always keep the last command in history
-    if history.len() > 0 {
+    if !history.is_empty() {
         info!("Clearing command history");
         history.drain(..history.len() - 1);
     }

src/commands.rs

@@ -8,12 +8,12 @@ use reqwest::blocking::Client as HttpClient;
 use serenity::{model::channel::Message, prelude::Context};
 use std::{collections::HashMap, sync::Arc};
 
-pub(crate) const PREFIX: &'static str = "?";
+pub(crate) const PREFIX: &str = "?";
 pub(crate) type GuardFn = fn(&Args) -> Result<bool, Error>;
 
 struct Command {
     guard: GuardFn,
-    ptr: Box<dyn for<'m> Fn(Args<'m>) -> Result<(), Error> + Send + Sync>,
+    ptr: Box<dyn Fn(Args<'_>) -> Result<(), Error> + Send + Sync>,
 }
 
 impl Command {
@@ -70,7 +70,7 @@ impl Commands {
 
         command
             .split(' ')
-            .filter(|segment| segment.len() > 0)
+            .filter(|segment| !segment.is_empty())
             .enumerate()
             .for_each(|(i, segment)| {
                 if let Some(name) = key_value_pair(segment) {
@@ -96,9 +96,9 @@ impl Commands {
                         state = self.add_code_segment_multi_line(state, segment);
                     } else if segment.starts_with("```") && segment.ends_with("```") {
                         state = self.add_code_segment_single_line(state, 3, segment);
-                    } else if segment.starts_with("`") && segment.ends_with("`") {
+                    } else if segment.starts_with('`') && segment.ends_with('`') {
                         state = self.add_code_segment_single_line(state, 1, segment);
-                    } else if segment.starts_with("{") && segment.ends_with("}") {
+                    } else if segment.starts_with('{') && segment.ends_with('}') {
                         state = self.add_dynamic_segment(state, segment);
                     } else if segment.ends_with("...") {
                         state = self.add_remaining_segment(state, segment);
@@ -122,7 +122,7 @@ impl Commands {
             });
         } else {
             self.state_machine.set_final_state(state);
-            self.state_machine.set_handler(state, handler.clone());
+            self.state_machine.set_handler(state, handler);
         }
     }
 
@@ -169,7 +169,7 @@ impl Commands {
     pub(crate) fn execute<'m>(&'m self, cx: Context, msg: &Message) {
         let message = &msg.content;
         if !msg.is_own(&cx) && message.starts_with(PREFIX) {
-            self.state_machine.process(message).map(|matched| {
+            if let Some(matched) = self.state_machine.process(message) {
                 info!("Processing command: {}", message);
                 let args = Args {
                     http: &self.client,
@@ -195,7 +195,7 @@ impl Commands {
                     }
                     Err(e) => error!("{}", e),
                 }
-            });
+            };
         }
     }
 
@@ -323,10 +323,10 @@ impl Commands {
 
 fn key_value_pair(s: &'static str) -> Option<&'static str> {
     s.match_indices("={}")
-        .nth(0)
+        .next()
         .map(|pair| {
             let name = &s[0..pair.0];
-            if name.len() > 0 {
+            if !name.is_empty() {
                 Some(name)
             } else {
                 None

src/crates.rs

@@ -39,7 +39,7 @@ fn get_crate(args: &Args) -> Result<Option<Crate>, Error> {
         .send()?
         .json::<Crates>()?;
 
-    Ok(crate_list.crates.into_iter().nth(0))
+    Ok(crate_list.crates.into_iter().next())
 }
 
 pub fn search(args: Args) -> Result<(), Error> {

src/main.rs

@@ -24,7 +24,6 @@ mod welcome;
 use crate::db::DB;
 use commands::{Args, Commands, GuardFn};
 use diesel::prelude::*;
-use envy;
 use indexmap::IndexMap;
 use serde::Deserialize;
 use serenity::{model::prelude::*, prelude::*};
@@ -203,16 +202,15 @@ fn app() -> Result<(), Error> {
 }
 
 fn main_menu(args: &Args, commands: &IndexMap<&str, (&str, GuardFn)>) -> String {
-    let mut menu = format!("Commands:\n");
-
-    menu = commands
-        .iter()
-        .fold(menu, |mut menu, (base_cmd, (description, guard))| {
+    let mut menu = commands.iter().fold(
+        "Commands:\n".to_owned(),
+        |mut menu, (base_cmd, (description, guard))| {
             if let Ok(true) = (guard)(&args) {
                 menu += &format!("\t{cmd:<12}{desc}\n", cmd = base_cmd, desc = description);
             }
             menu
-        });
+        },
+    );
 
     menu += &format!("\t{help:<12}This menu\n", help = "?help");
     menu += "\nType ?help command for more info on a command.";

src/playground.rs

@@ -185,7 +185,7 @@ fn run_code(args: &Args, code: &str) -> Result<String, Error> {
                 errors,
                 get_playground_link(args, code, &request)?
             )
-        } else if result.len() == 0 {
+        } else if result.is_empty() {
             format!("{}compilation succeeded.", errors)
         } else {
             format!("{}```\n{}```", errors, result)

src/state_machine.rs

@@ -34,11 +34,11 @@ impl CharacterSet {
         match val {
             0..=63 => {
                 let bit = 1 << val;
-                self.low_mask = self.low_mask | bit;
+                self.low_mask |= bit;
             }
             64..=127 => {
-                let bit = 1 << val - 64;
-                self.high_mask = self.high_mask | bit;
+                let bit = 1 << (val - 64);
+                self.high_mask |= bit;
             }
             _ => {}
         }
@@ -51,11 +51,11 @@ impl CharacterSet {
         match val {
             0..=63 => {
                 let bit = 1 << val;
-                self.low_mask = self.low_mask & !bit;
+                self.low_mask &= !bit;
             }
             64..=127 => {
-                let bit = 1 << val - 64;
-                self.high_mask = self.high_mask & !bit;
+                let bit = 1 << (val - 64);
+                self.high_mask &= !bit;
             }
             _ => {}
         }
@@ -72,7 +72,7 @@ impl CharacterSet {
             }
             64..=127 => {
                 // flip a bit within 0 - 63
-                let bit = 1 << val - 64;
+                let bit = 1 << (val - 64);
                 self.high_mask & bit != 0
             }
             _ => self.any,

src/text.rs

@@ -1,4 +1,4 @@
-pub(crate) const WELCOME_BILLBOARD: &'static str = "By participating in this community, you agree to follow the Rust Code of Conduct, as linked below. Please click the :white_check_mark: below to acknowledge and gain access to the channels.
+pub(crate) const WELCOME_BILLBOARD: &str = "By participating in this community, you agree to follow the Rust Code of Conduct, as linked below. Please click the :white_check_mark: below to acknowledge and gain access to the channels.
 
   https://www.rust-lang.org/policies/code-of-conduct
 
@@ -8,4 +8,4 @@ pub(crate) fn ban_message(reason: &str, hours: u64) -> String {
     format!("You have been banned from The Rust Programming Language discord server for {}. The ban will expire in {} hours. If you feel this action was taken unfairly, you can reach the Rust moderation team at [email protected]", reason, hours)
 }
 
-pub(crate) const WG_AND_TEAMS_MISSING_ENV_VAR: &'static str = "missing value for field wg_and_teams_id.\n\nIf you enabled tags or crates then you need the WG_AND_TEAMS_ID env var.";
+pub(crate) const WG_AND_TEAMS_MISSING_ENV_VAR: &str = "missing value for field wg_and_teams_id.\n\nIf you enabled tags or crates then you need the WG_AND_TEAMS_ID env var.";