diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-12-13 17:34:53 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-12-13 17:34:53 +0100 |
| commit | e175aaa139da8010fd3ae85bfc10dc7d98d50acc (patch) | |
| tree | e06c414c5e79077c747984877aab742b011fc467 /mullvad-cli/src/main.rs | |
| parent | f1aacc7b952a2a9fb2adfd476311ec13835e49d8 (diff) | |
| parent | 111c8aadc3c1ee404c69283d8e1b8a56a36cf75e (diff) | |
| download | mullvadvpn-e175aaa139da8010fd3ae85bfc10dc7d98d50acc.tar.xz mullvadvpn-e175aaa139da8010fd3ae85bfc10dc7d98d50acc.zip | |
Merge branch 'convert-more-to-rust2018'
Diffstat (limited to 'mullvad-cli/src/main.rs')
| -rw-r--r-- | mullvad-cli/src/main.rs | 17 |
1 files changed, 3 insertions, 14 deletions
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; |
