summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2018-05-04 17:15:35 +0100
committerEmīls Piņķis <emils@mullvad.net>2018-05-07 16:16:40 +0100
commit01709a4abcda5a1eccfcc9cf135ff26401d406a6 (patch)
tree47ca5f99bf8854410c0ab46c59c70291c48f20f6 /mullvad-daemon
parent7a40617ca838cb3258ffcf49c4823d668aaa3c12 (diff)
downloadmullvadvpn-01709a4abcda5a1eccfcc9cf135ff26401d406a6.tar.xz
mullvadvpn-01709a4abcda5a1eccfcc9cf135ff26401d406a6.zip
Updating formatting to be up to date with the newest rustfmt
Diffstat (limited to 'mullvad-daemon')
-rw-r--r--mullvad-daemon/src/relays.rs5
-rw-r--r--mullvad-daemon/src/settings.rs5
-rw-r--r--mullvad-daemon/src/system_service.rs12
3 files changed, 13 insertions, 9 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs
index e5a56bf4f0..778886163f 100644
--- a/mullvad-daemon/src/relays.rs
+++ b/mullvad-daemon/src/relays.rs
@@ -5,8 +5,9 @@ use futures::Future;
use mullvad_rpc::{HttpHandle, RelayListProxy};
use mullvad_types::location::Location;
-use mullvad_types::relay_constraints::{Constraint, LocationConstraint, Match, OpenVpnConstraints,
- RelayConstraints, TunnelConstraints};
+use mullvad_types::relay_constraints::{
+ Constraint, LocationConstraint, Match, OpenVpnConstraints, RelayConstraints, TunnelConstraints,
+};
use mullvad_types::relay_list::{Relay, RelayList, RelayTunnels};
use serde_json;
diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs
index 9bf7245e03..9050d289c7 100644
--- a/mullvad-daemon/src/settings.rs
+++ b/mullvad-daemon/src/settings.rs
@@ -2,8 +2,9 @@ extern crate serde_json;
use app_dirs;
-use mullvad_types::relay_constraints::{Constraint, LocationConstraint, RelayConstraints,
- RelaySettings, RelaySettingsUpdate};
+use mullvad_types::relay_constraints::{
+ Constraint, LocationConstraint, RelayConstraints, RelaySettings, RelaySettingsUpdate,
+};
use talpid_types::net::TunnelOptions;
use std::fs::File;
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index 5c6e612cc5..af170247d1 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -9,11 +9,13 @@ use std::{env, io, thread};
use cli;
use error_chain::ChainedError;
-use windows_service::service::{ServiceAccess, ServiceControl, ServiceControlAccept,
- ServiceErrorControl, ServiceExitCode, ServiceInfo,
- ServiceStartType, ServiceState, ServiceStatus, ServiceType};
-use windows_service::service_control_handler::{self, ServiceControlHandlerResult,
- ServiceStatusHandle};
+use windows_service::service::{
+ ServiceAccess, ServiceControl, ServiceControlAccept, ServiceErrorControl, ServiceExitCode,
+ ServiceInfo, ServiceStartType, ServiceState, ServiceStatus, ServiceType,
+};
+use windows_service::service_control_handler::{
+ self, ServiceControlHandlerResult, ServiceStatusHandle,
+};
use windows_service::service_dispatcher;
use windows_service::service_manager::{ServiceManager, ServiceManagerAccess};