Use derive attribute for default enum variants

5 files changed, 10 insertions, 35 deletions

diff --git a/mullvad-daemon/src/migrations/v3.rs b/mullvad-daemon/src/migrations/v3.rs
index 7d2800e32a..0f746a07d6 100644
--- a/mullvad-daemon/src/migrations/v3.rs
+++ b/mullvad-daemon/src/migrations/v3.rs
@@ -6,19 +6,14 @@ use std::net::IpAddr;
 // Section for vendoring types and values that
 // this settings version depend on. See `mod.rs`.
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(rename_all = "snake_case")]
 pub enum DnsState {
+    #[default]
     Default,
     Custom,
 }
 
-impl Default for DnsState {
-    fn default() -> Self {
-        Self::Default
-    }
-}
-
 /// DNS config
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(default)]
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs
index ffbb317bd3..7311928fec 100644
--- a/mullvad-types/src/relay_constraints.rs
+++ b/mullvad-types/src/relay_constraints.rs
@@ -497,20 +497,15 @@ pub enum BridgeSettings {
     Custom(ProxySettings),
 }
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum SelectedObfuscation {
     Auto,
+    #[default]
     Off,
     Udp2Tcp,
 }
 
-impl Default for SelectedObfuscation {
-    fn default() -> Self {
-        SelectedObfuscation::Off
-    }
-}
-
 impl fmt::Display for SelectedObfuscation {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
diff --git a/mullvad-types/src/settings/dns.rs b/mullvad-types/src/settings/dns.rs
index f379fd286f..2fbde01cc2 100644
--- a/mullvad-types/src/settings/dns.rs
+++ b/mullvad-types/src/settings/dns.rs
@@ -3,19 +3,14 @@ use jnix::{jni::objects::JObject, FromJava, IntoJava, JnixEnv};
 use serde::{Deserialize, Serialize};
 use std::net::IpAddr;
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(rename_all = "snake_case")]
 pub enum DnsState {
+    #[default]
     Default,
     Custom,
 }
 
-impl Default for DnsState {
-    fn default() -> Self {
-        Self::Default
-    }
-}
-
 /// DNS config
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[serde(default)]
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 3d0075257b..af13e5b4e7 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -81,20 +81,15 @@ pub fn ensure_best_metric_for_interface(interface_alias: &str) -> Result<bool, E
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Default, Clone, Copy)]
 #[allow(dead_code)]
 #[repr(u32)]
 pub enum WinNetAddrFamily {
+    #[default]
     IPV4 = 0,
     IPV6 = 1,
 }
 
-impl Default for WinNetAddrFamily {
-    fn default() -> Self {
-        WinNetAddrFamily::IPV4
-    }
-}
-
 impl WinNetAddrFamily {
     pub fn to_windows_proto_enum(&self) -> u16 {
         match self {
diff --git a/talpid-types/src/net/mod.rs b/talpid-types/src/net/mod.rs
index 9e546fee5b..20ef780f5c 100644
--- a/talpid-types/src/net/mod.rs
+++ b/talpid-types/src/net/mod.rs
@@ -300,19 +300,14 @@ impl fmt::Display for AllowedTunnelTraffic {
 }
 
 /// IP protocol version.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum IpVersion {
+    #[default]
     V4,
     V6,
 }
 
-impl Default for IpVersion {
-    fn default() -> IpVersion {
-        IpVersion::V4
-    }
-}
-
 impl fmt::Display for IpVersion {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         match *self {