Merge branch 'convert-more-to-rust2018'

12 files changed, 11 insertions, 29 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 5ab7180771..c980cca936 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,6 +1,5 @@
 use crate::{new_rpc_client, Command, Result};
-use clap::{self, value_t_or_exit};
-
+use clap::value_t_or_exit;
 use mullvad_types::account::AccountToken;
 
 pub struct Account;
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index 98b4b9e323..92a08a0ebf 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,5 +1,5 @@
 use crate::{new_rpc_client, Command, Result};
-use clap::{self, value_t_or_exit};
+use clap::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 62fb572b5f..8e74a16d1e 100644
--- a/mullvad-cli/src/cmds/block_when_disconnected.rs
+++ b/mullvad-cli/src/cmds/block_when_disconnected.rs
@@ -1,5 +1,5 @@
 use crate::{new_rpc_client, Command, Result};
-use clap::{self, value_t_or_exit};
+use clap::value_t_or_exit;
 
 pub struct BlockWhenDisconnected;
 
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index 05d2b7de95..d75c1b2195 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,5 +1,4 @@
 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 68b677e902..5375ad0535 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,6 +1,4 @@
 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 5840545df8..44efd92f5c 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -1,5 +1,5 @@
 use crate::{new_rpc_client, Command, Result};
-use clap::{self, value_t_or_exit};
+use clap::value_t_or_exit;
 
 pub struct Lan;
 
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 0a16b952f4..43e1968065 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -32,8 +32,8 @@ mod version;
 pub use self::version::Version;
 
 /// Returns a map of all available subcommands with their name as key.
-pub fn get_commands() -> HashMap<&'static str, Box<Command>> {
-    let commands: Vec<Box<Command>> = vec![
+pub fn get_commands() -> HashMap<&'static str, Box<dyn Command>> {
+    let commands: Vec<Box<dyn Command>> = vec![
         Box::new(Account),
         Box::new(AutoConnect),
         Box::new(BlockWhenDisconnected),
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 80b74d01ac..058c17976a 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,5 +1,5 @@
 use crate::{new_rpc_client, Command, Result, ResultExt};
-use clap::{self, value_t};
+use clap::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 e9c6da56e8..11b0156edf 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,6 +1,4 @@
 use crate::{new_rpc_client, Command, Result};
-use clap;
-
 use mullvad_ipc_client::DaemonRpcClient;
 use mullvad_types::auth_failed::AuthFailed;
 use talpid_types::tunnel::BlockReason;
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 7a45f5274f..a45ae31c17 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -1,5 +1,5 @@
 use crate::{new_rpc_client, Command, Result};
-use clap::{self, value_t};
+use clap::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 065ce4b8ba..b255f98c54 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -1,5 +1,4 @@
 use crate::{new_rpc_client, Command, Result};
-use clap;
 
 pub struct Version;
 
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index 6a3a547b9c..05b6c89163 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -6,26 +6,15 @@
 //! GNU General Public License as published by the Free Software Foundation, either version 3 of
 //! the License, or (at your option) any later version.
 
-extern crate clap;
-extern crate env_logger;
-extern crate futures;
 #[macro_use]
 extern crate error_chain;
-extern crate mullvad_ipc_client;
-extern crate mullvad_paths;
-extern crate mullvad_types;
-extern crate serde;
-extern crate talpid_types;
-
-mod cmds;
 
 use clap::{crate_authors, crate_description, crate_name};
+use error_chain::ChainedError;
 use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient};
+use std::{alloc::System, io};
 
-use std::alloc::System;
-use std::io;
-
-use error_chain::ChainedError;
+mod cmds;
 
 #[global_allocator]
 static GLOBAL: System = System;