Merge branch 'main' into pmt

rapiz1 · May 6, 2023 · 567e70e · 567e70e
2 parents 18262a2 + a181590
commit 567e70e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/config.rs b/src/config.rs
@@ -40,8 +40,9 @@ impl From<&str> for MaskedString {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq, Default)]
 pub enum TransportType {
+    #[default]
     #[serde(rename = "tcp")]
     Tcp,
     #[serde(rename = "tls")]
@@ -50,12 +51,6 @@ pub enum TransportType {
     Noise,
 }
 
-impl Default for TransportType {
-    fn default() -> TransportType {
-        TransportType::Tcp
-    }
-}
-
 /// Per service config
 /// All Option are optional in configuration but must be Some value in runtime
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Default)]
@@ -81,18 +76,16 @@ impl ClientServiceConfig {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
+#[derive(Default)]
 pub enum ServiceType {
     #[serde(rename = "tcp")]
+    #[default]
     Tcp,
     #[serde(rename = "udp")]
     Udp,
 }
 
-impl Default for ServiceType {
-    fn default() -> Self {
-        ServiceType::Tcp
-    }
-}
+
 
 fn default_service_type() -> ServiceType {
     Default::default()