Update rustfmt to 0.2.16

2 files changed, 4 insertions, 3 deletions

diff --git a/format.sh b/format.sh
index 1603a29b3f..a0765bd03e 100755
--- a/format.sh
+++ b/format.sh
@@ -5,7 +5,7 @@
 
 set -u
 
-VERSION="0.2.15"
+VERSION="0.2.16"
 CMD="rustfmt"
 INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
 
@@ -14,6 +14,7 @@ function correct_rustfmt() {
         echo "$CMD is not installed" >&2
         return 1
     fi
+    export DYLD_LIBRARY_PATH=$(rustc --print sysroot)/lib
     local installed_version=$($CMD --version | cut -d'-' -f1)
     if [[ "$installed_version" != "$VERSION" ]]; then
         echo "Wrong version of $CMD installed. Expected $VERSION, got $installed_version" >&2
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 2adcb0a9b7..c1c7aa4980 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -562,8 +562,8 @@ impl Daemon {
                 Ok(())
             }
             (TargetState::Unsecured, TunnelState::NotRunning) => self.reset_security_policy(),
-            (TargetState::Unsecured, TunnelState::Connecting) |
-            (TargetState::Unsecured, TunnelState::Connected) => self.kill_tunnel(),
+            (TargetState::Unsecured, TunnelState::Connecting)
+            | (TargetState::Unsecured, TunnelState::Connected) => self.kill_tunnel(),
             (..) => Ok(()),
         }
     }