Fix formatting for rustfmt for rustc 1.32.0-nightly (f1e2fa8f0 2018-11-20)

25 files changed, 27 insertions, 26 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 1dfff05f6c..5ab7180771 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t_or_exit};
 use crate::{new_rpc_client, Command, Result};
+use clap::{self, value_t_or_exit};
 
 use mullvad_types::account::AccountToken;
 
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index 41629ad822..98b4b9e323 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t_or_exit};
 use crate::{new_rpc_client, Command, Result};
+use clap::{self, value_t_or_exit};
 
 pub struct AutoConnect;
 
diff --git a/mullvad-cli/src/cmds/block_when_disconnected.rs b/mullvad-cli/src/cmds/block_when_disconnected.rs
index 23ba31ebb1..62fb572b5f 100644
--- a/mullvad-cli/src/cmds/block_when_disconnected.rs
+++ b/mullvad-cli/src/cmds/block_when_disconnected.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t_or_exit};
 use crate::{new_rpc_client, Command, Result};
+use clap::{self, value_t_or_exit};
 
 pub struct BlockWhenDisconnected;
 
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index a6fc4b3594..05d2b7de95 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,5 +1,5 @@
-use clap;
 use crate::{new_rpc_client, Command, Result};
+use clap;
 use error_chain::ChainedError;
 
 pub struct Connect;
diff --git a/mullvad-cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs
index 6bfd3e8ef5..68b677e902 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,5 +1,5 @@
-use clap;
 use crate::{new_rpc_client, Command, Result};
+use clap;
 
 
 pub struct Disconnect;
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 000f05f3fe..5840545df8 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t_or_exit};
 use crate::{new_rpc_client, Command, Result};
+use clap::{self, value_t_or_exit};
 
 pub struct Lan;
 
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 538217df6b..80b74d01ac 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t};
 use crate::{new_rpc_client, Command, Result, ResultExt};
+use clap::{self, value_t};
 use std::str::FromStr;
 
 use mullvad_types::relay_constraints::{
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 05d5e80959..e9c6da56e8 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,5 +1,5 @@
-use clap;
 use crate::{new_rpc_client, Command, Result};
+use clap;
 
 use mullvad_ipc_client::DaemonRpcClient;
 use mullvad_types::auth_failed::AuthFailed;
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 3ed2555aad..55cb26ed54 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -1,5 +1,5 @@
-use clap::{self, value_t};
 use crate::{new_rpc_client, Command, Result};
+use clap::{self, value_t};
 
 use talpid_types::net::{
     LocalOpenVpnProxySettings, OpenVpnProxyAuth, OpenVpnProxySettings,
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index e88468b9a7..065ce4b8ba 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -1,5 +1,5 @@
-use clap;
 use crate::{new_rpc_client, Command, Result};
+use clap;
 
 pub struct Version;
 
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index b5ef9dd21e..16f9123bb7 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -74,7 +74,7 @@ use talpid_types::{
 };
 
 
-error_chain!{
+error_chain! {
     errors {
         NoCacheDir {
             description("Unable to create cache directory")
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 7f9771592f..dbb526801f 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -35,7 +35,7 @@ mod version;
 
 const DAEMON_LOG_FILENAME: &str = "daemon.log";
 
-error_chain!{
+error_chain! {
     errors {
         LogError(msg: &'static str) {
             description("Error setting up log")
diff --git a/mullvad-daemon/src/shutdown.rs b/mullvad-daemon/src/shutdown.rs
index 4433984429..ed86068d38 100644
--- a/mullvad-daemon/src/shutdown.rs
+++ b/mullvad-daemon/src/shutdown.rs
@@ -1,4 +1,4 @@
-error_chain!{}
+error_chain! {}
 
 #[cfg(unix)]
 mod platform {
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index 183e5591d6..be288aaf53 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -70,7 +70,7 @@ macro_rules! write_line {
     };
 }
 
-error_chain!{
+error_chain! {
     errors {
         LogDirError(path: PathBuf) {
             description("Error listing the files in the mullvad-daemon log directory")
diff --git a/mullvad-rpc/src/lib.rs b/mullvad-rpc/src/lib.rs
index a5267e26db..0d886bfaaa 100644
--- a/mullvad-rpc/src/lib.rs
+++ b/mullvad-rpc/src/lib.rs
@@ -98,8 +98,9 @@ impl MullvadRpcFactory {
 
     fn setup_connection<F>(&mut self, create_transport: F) -> Result<HttpHandle, HttpError>
     where
-        F: FnOnce(HttpTransportBuilder<HttpsClientWithSni>)
-            -> jsonrpc_client_http::Result<HttpTransport>,
+        F: FnOnce(
+            HttpTransportBuilder<HttpsClientWithSni>,
+        ) -> jsonrpc_client_http::Result<HttpTransport>,
     {
         let client = HttpsClientWithSni::new(API_HOST.to_owned(), self.ca_path.clone());
         let transport_builder = HttpTransportBuilder::with_client(client).timeout(RPC_TIMEOUT);
diff --git a/mullvad-types/src/custom_tunnel.rs b/mullvad-types/src/custom_tunnel.rs
index 044770de54..0ada1c7643 100644
--- a/mullvad-types/src/custom_tunnel.rs
+++ b/mullvad-types/src/custom_tunnel.rs
@@ -4,7 +4,7 @@ use std::{
 };
 use talpid_types::net::{TunnelEndpoint, TunnelEndpointData};
 
-error_chain!{
+error_chain! {
     errors {
         InvalidHost(host: String) {
             display("Invalid host: {}", host)
diff --git a/talpid-core/src/logging.rs b/talpid-core/src/logging.rs
index 4927262643..512f86c9a6 100644
--- a/talpid-core/src/logging.rs
+++ b/talpid-core/src/logging.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 use std::{fs, io};
 
-error_chain!{}
+error_chain! {}
 
 /// Create a new log file while backing up a previous version of it.
 ///
diff --git a/talpid-core/src/offline/dummy.rs b/talpid-core/src/offline/dummy.rs
index 7312f4780c..1c2da77819 100644
--- a/talpid-core/src/offline/dummy.rs
+++ b/talpid-core/src/offline/dummy.rs
@@ -1,7 +1,7 @@
 use futures::sync::mpsc::UnboundedSender;
 use tunnel_state_machine::TunnelCommand;
 
-error_chain!{}
+error_chain! {}
 
 pub struct MonitorHandle;
 
diff --git a/talpid-core/src/offline/windows.rs b/talpid-core/src/offline/windows.rs
index 88607cd47b..eb8fe9a5b8 100644
--- a/talpid-core/src/offline/windows.rs
+++ b/talpid-core/src/offline/windows.rs
@@ -35,7 +35,7 @@ use tunnel_state_machine::TunnelCommand;
 const CLASS_NAME: &[u8] = b"S\0T\0A\0T\0I\0C\0\0\0";
 const REQUEST_THREAD_SHUTDOWN: UINT = WM_USER + 1;
 
-error_chain!{
+error_chain! {
     errors {
         ThreadCreationError {
             description("Unable to create listener thread")
diff --git a/talpid-core/src/security/windows/dns.rs b/talpid-core/src/security/windows/dns.rs
index 782fac09eb..8023d07b03 100644
--- a/talpid-core/src/security/windows/dns.rs
+++ b/talpid-core/src/security/windows/dns.rs
@@ -13,7 +13,7 @@ use super::system_state::SystemStateWriter;
 
 const DNS_STATE_FILENAME: &'static str = "dns-state-backup";
 
-error_chain!{
+error_chain! {
     errors{
         /// Failure to initialize WinDns
         Initialization{
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 410dcc39bb..fbf5a06f9d 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -34,7 +34,7 @@ const OPENVPN_BIN_FILENAME: &str = "openvpn";
 #[cfg(windows)]
 const OPENVPN_BIN_FILENAME: &str = "openvpn.exe";
 
-error_chain!{
+error_chain! {
     errors {
         /// An error indicating there was an error listening for events from the VPN tunnel.
         TunnelMonitoringError {
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index ded2e56af5..c57be646d8 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -14,7 +14,7 @@ use std::time::Duration;
 use talpid_ipc;
 
 mod errors {
-    error_chain!{
+    error_chain! {
         errors {
             /// Unable to start, wait for or kill the OpenVPN process.
             ChildProcessError(msg: &'static str) {
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index cde325e63e..7c1215ea3c 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -3,7 +3,7 @@ use std::ptr;
 use libc::{c_char, c_void, wchar_t};
 use widestring::WideCString;
 
-error_chain!{
+error_chain! {
     errors{
         /// Failure to set metrics of network interfaces
         MetricApplication{
diff --git a/talpid-ipc/src/lib.rs b/talpid-ipc/src/lib.rs
index 30883eaf90..847228bec2 100644
--- a/talpid-ipc/src/lib.rs
+++ b/talpid-ipc/src/lib.rs
@@ -35,7 +35,7 @@ use std::fmt;
 /// An Id created by the Ipc server that the client can use to connect to it
 pub type IpcServerId = String;
 
-error_chain!{
+error_chain! {
     errors {
         IpcServerError {
             description("Error in IPC server")
diff --git a/talpid-openvpn-plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs
index aba5d4ab7e..8faff42a79 100644
--- a/talpid-openvpn-plugin/src/lib.rs
+++ b/talpid-openvpn-plugin/src/lib.rs
@@ -29,7 +29,7 @@ mod processing;
 use crate::processing::EventProcessor;
 
 
-error_chain!{
+error_chain! {
     errors {
         InitHandleFailed {
             description("Unable to initialize event processor")