Clippy

src/config.rs

@@ -11,7 +11,7 @@ use structopt::{clap::Shell, StructOpt};
 pub const DEFAULT_PEER_TIMEOUT: u16 = 300;
 pub const DEFAULT_PORT: u16 = 3210;
 
-#[derive(Deserialize, Debug, PartialEq, Clone)]
+#[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Config {
     pub device_type: Type,
     pub device_name: String,
@@ -622,7 +622,7 @@ pub enum Command {
     },
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, default)]
 pub struct ConfigFileDevice {
     #[serde(rename = "type")]
@@ -633,7 +633,7 @@ pub struct ConfigFileDevice {
     pub fix_rp_filter: Option<bool>,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, default)]
 pub struct ConfigFileBeacon {
     pub store: Option<String>,
@@ -642,14 +642,14 @@ pub struct ConfigFileBeacon {
     pub password: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, default)]
 pub struct ConfigFileStatsd {
     pub server: Option<String>,
     pub prefix: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, default)]
 pub struct ConfigFile {
     pub device: Option<ConfigFileDevice>,

src/crypto/common.rs

@@ -47,7 +47,7 @@ pub struct Algorithms {
     pub allow_unencrypted: bool,
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, default)]
 pub struct Config {
     pub password: Option<String>,
@@ -201,13 +201,14 @@ impl Crypto {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum MessageResult {
     Message(u8),
     Reply,
     None,
 }
 
+#[allow(clippy::large_enum_variant)]
 pub enum PeerCrypto {
     Encrypted {
         last_init_message: Vec<u8>,

src/crypto/init.rs

@@ -384,7 +384,7 @@ impl InitMsg {
     }
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum InitResult<P: Payload> {
     Continue,
     Success { peer_payload: P, is_initiator: bool },

src/device.rs

@@ -34,7 +34,7 @@ impl IfReq {
 }
 
 /// The type of a tun/tap device
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Type {
     /// Tun interface: This interface transports IP packets.
     #[serde(rename = "tun")]

src/engine/shared.rs

@@ -19,6 +19,7 @@ use std::{
 use super::common::PeerData;
 
 #[derive(Clone)]
+#[allow(clippy::type_complexity)]
 pub struct SharedPeerCrypto {
     peers: Arc<Mutex<HashMap<SocketAddr, Option<Arc<CryptoCore>>, Hash>>>,
     cache: HashMap<SocketAddr, Option<Arc<CryptoCore>>, Hash>, //TODO: local hashmap as cache

src/engine/socket_thread.rs

@@ -89,6 +89,7 @@ pub struct SocketThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
 }
 
 impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS> {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         config: Config, device: D, socket: S, traffic: SharedTraffic, peer_crypto: SharedPeerCrypto,
         table: SharedTable<TS>, port_forwarding: Option<PortForwarding>, stats_file: Option<File>,

src/messages.rs

@@ -23,13 +23,13 @@ pub const MESSAGE_TYPE_CLOSE: u8 = 0xff;
 pub type AddrList = SmallVec<[SocketAddr; 4]>;
 pub type PeerList = SmallVec<[PeerInfo; 16]>;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct PeerInfo {
     pub node_id: Option<NodeId>,
     pub addrs: AddrList,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct NodeInfo {
     pub node_id: NodeId,
     pub peers: PeerList,

src/oldconfig.rs

@@ -6,7 +6,7 @@ use super::{device::Type, types::Mode, util::Duration};
 use crate::config::{ConfigFile, ConfigFileBeacon, ConfigFileDevice, ConfigFileStatsd, CryptoConfig};
 use std::collections::HashMap;
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Copy)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy)]
 pub enum OldCryptoMethod {
     #[serde(rename = "chacha20")]
     ChaCha20,
@@ -16,7 +16,7 @@ pub enum OldCryptoMethod {
     AES128,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)]
 pub struct OldConfigFile {
     #[serde(alias = "device-type")]
     pub device_type: Option<Type>,

src/types.rs

@@ -190,7 +190,7 @@ impl fmt::Debug for Range {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Mode {
     #[serde(rename = "normal")]
     Normal,

src/util.rs

@@ -379,7 +379,7 @@ pub fn from_base62(data: &str) -> Result<Vec<u8>, char> {
     let mut buf = Vec::with_capacity(data.len() / 2 + data.len() / 4);
     for c in data.chars() {
         let mut val = match c {
-            '0'..='9' => ((c as usize) % ('0' as usize)),
+            '0'..='9' => (c as usize) % ('0' as usize),
             'A'..='Z' => ((c as usize) % ('A' as usize)) + 10,
             'a'..='z' => ((c as usize) % ('a' as usize)) + 36,
             _ => return Err(c),