aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yujia Qiao <rapiz3142@gmail.com> 2022-09-04 22:04:20 +0800
committerGravatar GitHub <noreply@github.com> 2022-09-04 22:04:20 +0800
commit064bdcab8ec056d4ef3d7b4e6f57d7684de1b3af (patch)
treeea7db32ec66f208fc0b29f932e666fafed0bf366
parent67182fbc1062c543751dac3676c33b8da0dcead5 (diff)
downloadrathole-064bdcab8ec056d4ef3d7b4e6f57d7684de1b3af.tar.gz
rathole-064bdcab8ec056d4ef3d7b4e6f57d7684de1b3af.tar.zst
rathole-064bdcab8ec056d4ef3d7b4e6f57d7684de1b3af.zip
fix: clippy (#187)
-rw-r--r--src/config.rs24
-rw-r--r--src/config_watcher.rs4
2 files changed, 14 insertions, 14 deletions
diff --git a/src/config.rs b/src/config.rs
index 5d10534..6af9c26 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -15,7 +15,7 @@ const DEFAULT_HEARTBEAT_TIMEOUT_SECS: u64 = 40;
/// String with Debug implementation that emits "MASKED"
/// Used to mask sensitive strings when logging
-#[derive(Serialize, Deserialize, Default, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, Default, PartialEq, Eq, Clone)]
pub struct MaskedString(String);
impl Debug for MaskedString {
@@ -37,7 +37,7 @@ impl From<&str> for MaskedString {
}
}
-#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq)]
pub enum TransportType {
#[serde(rename = "tcp")]
Tcp,
@@ -53,7 +53,7 @@ impl Default for TransportType {
}
}
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)]
#[serde(deny_unknown_fields)]
pub struct ClientServiceConfig {
#[serde(rename = "type", default = "default_service_type")]
@@ -74,7 +74,7 @@ impl ClientServiceConfig {
}
}
-#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
pub enum ServiceType {
#[serde(rename = "tcp")]
Tcp,
@@ -92,7 +92,7 @@ fn default_service_type() -> ServiceType {
Default::default()
}
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)]
#[serde(deny_unknown_fields)]
pub struct ServerServiceConfig {
#[serde(rename = "type", default = "default_service_type")]
@@ -112,7 +112,7 @@ impl ServerServiceConfig {
}
}
}
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
#[serde(deny_unknown_fields)]
pub struct TlsConfig {
pub hostname: Option<String>,
@@ -125,7 +125,7 @@ fn default_noise_pattern() -> String {
String::from("Noise_NK_25519_ChaChaPoly_BLAKE2s")
}
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[serde(deny_unknown_fields)]
pub struct NoiseConfig {
#[serde(default = "default_noise_pattern")]
@@ -147,7 +147,7 @@ fn default_keepalive_interval() -> u64 {
DEFAULT_KEEPALIVE_INTERVAL
}
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[serde(deny_unknown_fields)]
pub struct TcpConfig {
#[serde(default = "default_nodelay")]
@@ -170,7 +170,7 @@ impl Default for TcpConfig {
}
}
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Default)]
#[serde(deny_unknown_fields)]
pub struct TransportConfig {
#[serde(rename = "type")]
@@ -185,7 +185,7 @@ fn default_heartbeat_timeout() -> u64 {
DEFAULT_HEARTBEAT_TIMEOUT_SECS
}
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Clone)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Eq, Clone)]
#[serde(deny_unknown_fields)]
pub struct ClientConfig {
pub remote_addr: String,
@@ -201,7 +201,7 @@ fn default_heartbeat_interval() -> u64 {
DEFAULT_HEARTBEAT_INTERVAL_SECS
}
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Clone)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Eq, Clone)]
#[serde(deny_unknown_fields)]
pub struct ServerConfig {
pub bind_addr: String,
@@ -213,7 +213,7 @@ pub struct ServerConfig {
pub heartbeat_interval: u64,
}
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
#[serde(deny_unknown_fields)]
pub struct Config {
pub server: Option<ServerConfig>,
diff --git a/src/config_watcher.rs b/src/config_watcher.rs
index f80ac2c..25423cf 100644
--- a/src/config_watcher.rs
+++ b/src/config_watcher.rs
@@ -14,13 +14,13 @@ use tracing::{error, info, instrument};
#[cfg(feature = "notify")]
use notify::{EventKind, RecursiveMode, Watcher};
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub enum ConfigChange {
General(Box<Config>), // Trigger a full restart
ServiceChange(ServiceChange),
}
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub enum ServiceChange {
ClientAdd(ClientServiceConfig),
ClientDelete(String),