Merge branch 'prepare-for-rust2018'

10 files changed, 10 insertions, 17 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 24b86817dd..1dfff05f6c 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 {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 use mullvad_types::account::AccountToken;
 
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index bde829694e..41629ad822 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,6 +1,5 @@
 use clap::{self, value_t_or_exit};
-use new_rpc_client;
-use {Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct AutoConnect;
 
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index 40dbe5a5a0..a6fc4b3594 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,8 +1,6 @@
 use clap;
+use crate::{new_rpc_client, Command, Result};
 use error_chain::ChainedError;
-use new_rpc_client;
-use Command;
-use Result;
 
 pub struct Connect;
 
diff --git a/mullvad-cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs
index 99009d705f..6bfd3e8ef5 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,7 +1,5 @@
 use clap;
-use new_rpc_client;
-use Command;
-use Result;
+use crate::{new_rpc_client, Command, Result};
 
 
 pub struct Disconnect;
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index dffcc70a2e..000f05f3fe 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 {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct Lan;
 
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 02e5663d2f..e80ef875a5 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -1,5 +1,5 @@
+use crate::Command;
 use std::collections::HashMap;
-use Command;
 
 mod account;
 pub use self::account::Account;
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 9f12f8af33..538217df6b 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,6 +1,6 @@
 use clap::{self, value_t};
+use crate::{new_rpc_client, Command, Result, ResultExt};
 use std::str::FromStr;
-use {new_rpc_client, Command, Result, ResultExt};
 
 use mullvad_types::relay_constraints::{
     Constraint, LocationConstraint, OpenVpnConstraints, RelayConstraintsUpdate,
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index b1a05bfd07..826a494c9d 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,7 +1,5 @@
 use clap;
-use new_rpc_client;
-use Command;
-use Result;
+use crate::{new_rpc_client, Command, Result};
 
 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 329f72f6bd..3c77ed986c 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 {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 use talpid_types::net::{
     LocalOpenVpnProxySettings, OpenVpnProxyAuth, OpenVpnProxySettings,
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index 2277e57d68..e88468b9a7 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -1,5 +1,5 @@
 use clap;
-use {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct Version;