Upgrade rustfmt to 0.3.5

3 files changed, 8 insertions, 6 deletions

diff --git a/format.sh b/format.sh
index 2ee4194fa3..cc82f8e25a 100755
--- a/format.sh
+++ b/format.sh
@@ -5,7 +5,7 @@
 
 set -u
 
-VERSION="0.3.4"
+VERSION="0.3.5"
 CMD="rustfmt"
 INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
 
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 86dfd7763c..c48a990f62 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -211,8 +211,7 @@ impl Relay {
 fn parse_port_constraint(raw_port: &str) -> Result<Constraint<u16>> {
     match raw_port.to_lowercase().as_str() {
         "any" => Ok(Constraint::Any),
-        port => Ok(Constraint::Only(u16::from_str(port)
-            .chain_err(|| "Invalid port")?)),
+        port => Ok(Constraint::Only(u16::from_str(port).chain_err(|| "Invalid port")?)),
     }
 }
 
diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs
index 86d88ce615..762cd41075 100644
--- a/mullvad-types/src/relay_list.rs
+++ b/mullvad-types/src/relay_list.rs
@@ -23,8 +23,10 @@ pub struct RelayListCity {
     pub code: CityCode,
     pub latitude: f64,
     pub longitude: f64,
-    #[serde(skip_deserializing)] pub has_active_relays: bool,
-    #[serde(skip_serializing_if = "Vec::is_empty", default)] pub relays: Vec<Relay>,
+    #[serde(skip_deserializing)]
+    pub has_active_relays: bool,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub relays: Vec<Relay>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -35,7 +37,8 @@ pub struct Relay {
     pub include_in_country: bool,
     pub weight: u64,
     pub tunnels: RelayTunnels,
-    #[serde(skip)] pub location: Option<Location>,
+    #[serde(skip)]
+    pub location: Option<Location>,
 }
 
 #[derive(Debug, Default, Clone, Deserialize, Serialize)]