summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-03-21 14:32:42 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-03-21 14:32:42 +0100
commit3bfd954a3b04ec00c195bc785a8f2ade6122fe60 (patch)
tree63503f038ae5149b16555ac0fe42c49a78271a51
parentb83abbdc7b943cd4c1a451588445bf6615609c70 (diff)
parentd412ea5fe9c980c4af7af1eb190cab5d336b4848 (diff)
downloadmullvadvpn-3bfd954a3b04ec00c195bc785a8f2ade6122fe60.tar.xz
mullvadvpn-3bfd954a3b04ec00c195bc785a8f2ade6122fe60.zip
Merge branch 'upgrade-rustfmt'
-rw-r--r--mullvad-daemon/src/management_interface.rs10
-rw-r--r--rustfmt.toml2
-rw-r--r--talpid-core/src/tunnel/openvpn.rs2
3 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index c0463f58a6..cdc237ef30 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -345,10 +345,12 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterface<T> {
/// If it is `Ok(val)`, evaluates to `val`.
/// If it is `Err(e)` it early returns `Box<Future>` where the future will result in `e`.
macro_rules! try_future {
- ($result:expr) => (match $result {
- ::std::result::Result::Ok(val) => val,
- ::std::result::Result::Err(e) => return Box::new(future::err(e)),
- });
+ ($result: expr) => {
+ match $result {
+ ::std::result::Result::Ok(val) => val,
+ ::std::result::Result::Err(e) => return Box::new(future::err(e)),
+ }
+ };
}
impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for ManagementInterface<T> {
diff --git a/rustfmt.toml b/rustfmt.toml
index 9d1db87d00..75d71f4a8d 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,5 +1,3 @@
-required_version = "0.3.8"
-
# Activation of features, almost objectively better ;)
reorder_imports = true
reorder_imported_names = true
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index 5aa5a298a3..7093d5450c 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -32,7 +32,7 @@ pub use self::errors::*;
#[cfg(unix)]
-lazy_static!{
+lazy_static! {
static ref OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(2);
}