summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-10-05 15:39:54 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-10-05 15:39:54 +0200
commit52fd39bba60643a67f24b769d3d319624fd0c12d (patch)
tree62eab0187b277a192610f72d1b18b1a530e2b416
parent4903ac1e039860cb3a73df1b0a94fe39f1bdbcd0 (diff)
parent4a2f736d7783b18db07ead7ac3e22a49e3fb5637 (diff)
downloadmullvadvpn-52fd39bba60643a67f24b769d3d319624fd0c12d.tar.xz
mullvadvpn-52fd39bba60643a67f24b769d3d319624fd0c12d.zip
Merge branch 'upgrade-rustfmt-0.2.8'
-rwxr-xr-xformat.sh2
-rw-r--r--mullvad-daemon/src/cli.rs4
2 files changed, 2 insertions, 4 deletions
diff --git a/format.sh b/format.sh
index b14aa48458..adb840da27 100755
--- a/format.sh
+++ b/format.sh
@@ -5,7 +5,7 @@
set -u
-VERSION="0.2.6"
+VERSION="0.2.8"
CMD="rustfmt"
INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 215783bc77..d3350ad90f 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -49,8 +49,6 @@ fn create_app() -> App<'static, 'static> {
Arg::with_name("tunnel_log_file")
.long("tunnel-log")
.takes_value(true)
- .help(
- "Save log from tunnel implementation process to this file path",
- ),
+ .help("Save log from tunnel implementation process to this file path"),
)
}