cargo fix + make clippy happy

Author: Kiiyya

battlefield_rcon/src/bf4/ban_list.rs

@@ -1,9 +1,6 @@
 use std::time::Duration;
 
-use ascii::IntoAsciiString;
-
-use super::{RconEncoding, Eaid};
-
+use super::Eaid;
 
 #[derive(Clone, Debug)]
 pub enum Ban {

battlefox/src/mapvote.rs

@@ -25,6 +25,7 @@ use matching::AltMatcher;
 use multimap::MultiMap;
 use rand::{RngCore, thread_rng};
 use std::cell::Cell;
+use std::fmt::Write;
 use std::time::Instant;
 use std::{cmp::min, hash::Hash};
 use std::{
@@ -141,7 +142,7 @@ impl Inner {
             // msg += "\t";
             for (mip, matcher) in chunk {
                 // TODO: Add [NV] for vehicle_threshold as well
-                msg += &format!("\t{}\t{}", matcher.number, mip.map.tab4_prefixlen_wvehicles(matcher.minlen, mip.vehicles.unwrap_or(true))); // TODO: trim last \t of last chunk item.
+                write!(msg, "\t{}\t{}", matcher.number, mip.map.tab4_prefixlen_wvehicles(matcher.minlen, mip.vehicles.unwrap_or(true))).unwrap(); // TODO: trim last \t of last chunk item.
             }
             msg += "\n"; // TODO: trim last \n of last line.
         }

battlefox/src/mapvote/animate.rs

@@ -16,7 +16,7 @@ fn usize_of_rat(rat: &Rat) -> usize {
         warn!("{} is not an integer. Rounding towards zero and continuing..", rat);
     }
     let (sign, digits) = rat.to_integer().to_u64_digits();
-    *digits.get(0).unwrap_or(&0) as usize
+    *digits.first().unwrap_or(&0) as usize
 }
 
 type Bars = HashMap<MapInPool, String>;
@@ -95,7 +95,7 @@ pub fn stv_anim_frames<'a>(alts_start: &[MapInPool], players: impl Iterator<Item
 
         for (bars, hist_entry) in bars_seq.iter().zip_eq(x) {
             let mut lines = Vec::new();
-            let frame = match hist_entry {
+            match hist_entry {
                 HistEntry::Starting { profile, assignment } => {
                     lines.push("Everyones' votes:".to_string());
                     let your_vote = assignment.get(player)
@@ -113,7 +113,7 @@ pub fn stv_anim_frames<'a>(alts_start: &[MapInPool], players: impl Iterator<Item
                     let winner = elected.iter().next().unwrap();
                     lines.push(format!("Mapvote winner: {}", winner.map.Pretty()));
                 }
-            };
+            }
             player_frames.push(lines.join("\n"));
         }
 

battlefox/src/players.rs

@@ -213,7 +213,7 @@ impl Players {
     fn get_levenshtein(&self, map: &HashMap<Player, PlayerInServer>, target: &str) -> BTreeMap<usize, Player> {
         let target_lowercase = target.to_ascii_lowercase();
         map.iter().map(|(key, _value)| {
-            (levenshtein(&target_lowercase, &key.name.to_ascii_lowercase().to_string()), key.to_owned())
+            (levenshtein(&target_lowercase, key.name.to_ascii_lowercase().as_ref()), key.to_owned())
         }).collect()
     }
 }

battlefox/src/stv.rs

@@ -509,23 +509,23 @@ pub mod test {
     #[macro_export]
     macro_rules! ballot {
         [1, $($pref: expr),*] => {{
-            crate::stv::Ballot {
+            $crate::stv::Ballot {
                 weight: num_rational::BigRational::one(),
                 preferences: vec![
                     $($pref),*
                 ],
             }
         }};
         [2, $($pref: expr),*] => {{
-            crate::stv::Ballot {
+            $crate::stv::Ballot {
                 weight: Rat::one() + Rat::one(),
                 preferences: vec![
                     $($pref),*
                 ],
             }
         }};
         [0.5, $($pref: expr),*] => {{
-            crate::stv::Ballot {
+            $crate::stv::Ballot {
                 weight: num_rational::BigRational::one() / (num_rational::BigRational::one() + num_rational::BigRational::one()),
                 preferences: vec![
                     $($pref),*

battlefox/src/teamkilling.rs

@@ -163,6 +163,7 @@ impl TeamKilling {
 						// We consider this kill a teamkill exactly when teamkill_history is Some(_).
 						let teamkill_history = {
 							let mut lock = self.inner.lock().unwrap();
+							#[allow(clippy::significant_drop_in_scrutinee)] // this is a false positive...
 							let debug = match lock.debug_count_suicides_as_tk.get(&killer) {
 								Some(&DebugSatk::KillsAsTk) => true, // all kills are considered teamkills.
 								Some(&DebugSatk::SuicidesAsTk) => killer == victim, // only suicides

battlefox_database/src/lib.rs

@@ -64,7 +64,7 @@ pub fn replace_into_muted_player(conn: &MysqlConnection, player: &BfoxMutedPlaye
     // println!("Count: {}", exists);
 
     replace_into(bfox_muted_players)
-        .values(&*player)
+        .values(player)
         .execute(conn)?;
 
     Ok(())

battlefox_database/src/models.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::extra_unused_lifetimes)] // warning stems from macro-generated stuff...
 use chrono::NaiveDate;
 use serde::Serialize;
 

battlefox_shared/src/models/mute.rs

@@ -9,7 +9,7 @@ pub struct MutedPlayer {
     pub kicks: Option<u32>
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum MuteType {
     Disabled = 0,
     Round = 1,