Updating formatting to be up to date with the newest rustfmt

6 files changed, 26 insertions, 18 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};
 
diff --git a/talpid-core/src/firewall/macos/dns.rs b/talpid-core/src/firewall/macos/dns.rs
index 4ff86dd948..2cde3cf8ff 100644
--- a/talpid-core/src/firewall/macos/dns.rs
+++ b/talpid-core/src/firewall/macos/dns.rs
@@ -8,8 +8,9 @@ use self::core_foundation::propertylist::CFPropertyList;
 use self::core_foundation::runloop::{kCFRunLoopCommonModes, CFRunLoop};
 use self::core_foundation::string::CFString;
 
-use self::system_configuration::dynamic_store::{SCDynamicStore, SCDynamicStoreBuilder,
-                                                SCDynamicStoreCallBackContext};
+use self::system_configuration::dynamic_store::{
+    SCDynamicStore, SCDynamicStoreBuilder, SCDynamicStoreCallBackContext,
+};
 
 use error_chain::ChainedError;
 
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index ef24aac193..640f020fbd 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -12,8 +12,9 @@ use std::io::{self, Write};
 use std::net::Ipv4Addr;
 use std::path::{Path, PathBuf};
 
-use talpid_types::net::{Endpoint, OpenVpnTunnelOptions, TunnelEndpoint, TunnelEndpointData,
-                        TunnelOptions};
+use talpid_types::net::{
+    Endpoint, OpenVpnTunnelOptions, TunnelEndpoint, TunnelEndpointData, TunnelOptions,
+};
 
 /// A module for all OpenVPN related tunnel management.
 pub mod openvpn;
diff --git a/windows-service/examples/simple_service.rs b/windows-service/examples/simple_service.rs
index b1a717a8c1..31773519a5 100644
--- a/windows-service/examples/simple_service.rs
+++ b/windows-service/examples/simple_service.rs
@@ -48,11 +48,13 @@ mod simple_service {
     use log::LevelFilter;
     use simplelog::{CombinedLogger, Config, WriteLogger};
 
-    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};
     use windows_service::ChainedError;