Merge pull request #79 from rust-lang/linting-mostly

Apply some clippy lints

Author: technetos

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_default());
 
         let msg = msg.build();
 

src/commands.rs

@@ -8,7 +8,7 @@ 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 {
@@ -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);
         }
     }
 
@@ -166,7 +166,7 @@ impl Commands {
         self.menu.take()
     }
 
-    pub(crate) fn execute<'m>(&'m self, cx: Context, msg: &Message) {
+    pub(crate) fn execute(&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| {
@@ -201,8 +201,7 @@ impl Commands {
 
     fn add_space(&mut self, mut state: usize, i: usize) -> usize {
         if i > 0 {
-            let mut char_set = CharacterSet::from_char(' ');
-            char_set.insert('\n');
+            let char_set = CharacterSet::from_chars(&[' ', '\n']);
 
             state = self.state_machine.add(state, char_set);
             self.state_machine.add_next_state(state, state);
@@ -226,7 +225,7 @@ impl Commands {
         let name = &s[1..s.len() - 1];
 
         let mut char_set = CharacterSet::any();
-        char_set.remove(' ');
+        char_set.remove(&[' ']);
         state = self.state_machine.add(state, char_set);
         self.state_machine.add_next_state(state, state);
         self.state_machine.start_parse(state, name);
@@ -257,9 +256,7 @@ impl Commands {
         let lambda = state;
 
         let mut char_set = CharacterSet::any();
-        char_set.remove('`');
-        char_set.remove(' ');
-        char_set.remove('\n');
+        char_set.remove(&['`', ' ', '\n']);
         state = self.state_machine.add(state, char_set);
         self.state_machine.add_next_state(state, state);
 
@@ -310,8 +307,7 @@ impl Commands {
         state = self.state_machine.add(state, CharacterSet::from_char('='));
 
         let mut char_set = CharacterSet::any();
-        char_set.remove(' ');
-        char_set.remove('\n');
+        char_set.remove(&[' ', '\n']);
         state = self.state_machine.add(state, char_set);
         self.state_machine.add_next_state(state, state);
         self.state_machine.start_parse(state, name);
@@ -323,7 +319,7 @@ 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 {

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::*};
@@ -73,7 +72,7 @@ fn init_data(config: &Config) -> Result<(), Error> {
                 let wg_and_teams_role = config
                     .wg_and_teams_id
                     .as_ref()
-                    .ok_or_else(|| text::WG_AND_TEAMS_MISSING_ENV_VAR)?;
+                    .ok_or(text::WG_AND_TEAMS_MISSING_ENV_VAR)?;
                 upsert_role("wg_and_teams", &wg_and_teams_role)?;
             }
 

src/playground.rs

@@ -134,10 +134,10 @@ struct PlayResult {
 fn run_code(args: &Args, code: &str) -> Result<String, Error> {
     let mut errors = String::new();
 
-    let warnings = args.params.get("warn").unwrap_or_else(|| &"false");
-    let channel = args.params.get("channel").unwrap_or_else(|| &"nightly");
-    let mode = args.params.get("mode").unwrap_or_else(|| &"debug");
-    let edition = args.params.get("edition").unwrap_or_else(|| &"2018");
+    let warnings = args.params.get("warn").unwrap_or(&"false");
+    let channel = args.params.get("channel").unwrap_or(&"nightly");
+    let mode = args.params.get("mode").unwrap_or(&"debug");
+    let edition = args.params.get("edition").unwrap_or(&"2018");
 
     let mut request = PlaygroundCode::new(code);
 

src/state_machine.rs

@@ -34,31 +34,33 @@ 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;
+                self.high_mask |= bit;
             }
             _ => {}
         }
     }
 
-    /// Remove a character from the character set.   
-    pub(crate) fn remove(&mut self, ch: char) {
-        let val = ch as u32 - 1;
+    /// Remove characters from the character set.   
+    pub(crate) fn remove(&mut self, chs: &[char]) {
+        chs.iter().for_each(|ch| {
+            let val = *ch as u32 - 1;
 
-        match val {
-            0..=63 => {
-                let bit = 1 << val;
-                self.low_mask = self.low_mask & !bit;
-            }
-            64..=127 => {
-                let bit = 1 << val - 64;
-                self.high_mask = self.high_mask & !bit;
+            match val {
+                0..=63 => {
+                    let bit = 1 << val;
+                    self.low_mask &= !bit;
+                }
+                64..=127 => {
+                    let bit = 1 << val - 64;
+                    self.high_mask &= !bit;
+                }
+                _ => {}
             }
-            _ => {}
-        }
+        });
     }
 
     /// Check if the character `ch` is a member of the character set.  
@@ -85,6 +87,13 @@ impl CharacterSet {
         chars.insert(ch);
         chars
     }
+
+    /// Insert the characters `chs` into the character set.  
+    pub(crate) fn from_chars(chs: &[char]) -> Self {
+        let mut chars = Self::new();
+        chs.iter().for_each(|ch| chars.insert(*ch));
+        chars
+    }
 }
 
 pub(crate) struct State<T> {

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.";