diff --git a/Cargo.lock b/Cargo.lock index 283fd1bf..05d59122 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1272,9 +1272,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if", @@ -1304,9 +1304,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", @@ -1951,9 +1951,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg", "bytes", @@ -1967,7 +1967,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "winapi", + "windows-sys 0.42.0", ] [[package]] diff --git a/src/config.rs b/src/config.rs index 74015ed3..aa7f3969 100644 --- 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()