Merge branch 'no-more-macro-use'

5 files changed, 5 insertions, 6 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 1beee454c7..24b86817dd 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,4 +1,4 @@
-use clap;
+use clap::{self, value_t_or_exit};
 use {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 5d043f0f9b..bde829694e 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,4 +1,4 @@
-use clap;
+use clap::{self, value_t_or_exit};
 use new_rpc_client;
 use {Command, Result};
 
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 2c833533cf..dffcc70a2e 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -1,4 +1,4 @@
-use clap;
+use clap::{self, value_t_or_exit};
 use {new_rpc_client, Command, Result};
 
 pub struct Lan;
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index e056505069..f6838427ec 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,4 +1,4 @@
-use clap;
+use clap::{self, value_t};
 use std::str::FromStr;
 use {new_rpc_client, Command, Result, ResultExt};
 
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index d83556197e..68d4bf7194 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -6,7 +6,6 @@
 //! GNU General Public License as published by the Free Software Foundation, either version 3 of
 //! the License, or (at your option) any later version.
 
-#[macro_use]
 extern crate clap;
 extern crate env_logger;
 extern crate futures;
@@ -20,7 +19,7 @@ extern crate talpid_types;
 
 mod cmds;
 
-
+use clap::{crate_authors, crate_description, crate_name, crate_version};
 use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient};
 
 use std::alloc::System;