Add settings migration code, refactor and cleanup

Bump the settings version. Add code for migrating settings to new
version since it is now not backwards compatible.
Refactor LocationConstraint and related types to be more lean.
Cleanup issues and fix formatting.
Refactor LocationConstraint and add migration code

1 files changed, 2 insertions, 2 deletions

diff --git a/mullvad-management-interface/src/types/conversions/relay_constraints.rs b/mullvad-management-interface/src/types/conversions/relay_constraints.rs
index 221c2140b2..e987ca102b 100644
--- a/mullvad-management-interface/src/types/conversions/relay_constraints.rs
+++ b/mullvad-management-interface/src/types/conversions/relay_constraints.rs
@@ -488,7 +488,7 @@ impl From<mullvad_types::relay_constraints::LocationConstraint> for proto::Locat
     fn from(location: mullvad_types::relay_constraints::LocationConstraint) -> Self {
         use mullvad_types::relay_constraints::LocationConstraint;
         match location {
-            LocationConstraint::Location { location } => Self {
+            LocationConstraint::Location(location) => Self {
                 r#type: Some(proto::location_constraint::Type::Location(
                     proto::RelayLocation::from(location),
                 )),
@@ -515,7 +515,7 @@ impl TryFrom<proto::LocationConstraint>
                 match location {
                     Constraint::Any => Ok(Constraint::Any),
                     Constraint::Only(location) => {
-                        Ok(Constraint::Only(LocationConstraint::Location { location }))
+                        Ok(Constraint::Only(LocationConstraint::Location(location)))
                     }
                 }
             }