diff options
| -rw-r--r-- | mullvad-ipc-client/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-ipc-client/src/lib.rs | 48 |
2 files changed, 19 insertions, 30 deletions
diff --git a/mullvad-ipc-client/Cargo.toml b/mullvad-ipc-client/Cargo.toml index 05f39121e4..3e64338bb0 100644 --- a/mullvad-ipc-client/Cargo.toml +++ b/mullvad-ipc-client/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Mullvad VPN <admin@mullvad.net>"] description = "RPC client for Mullvad daemon" license = "GPL-3.0" +edition = "2018" [dependencies] error-chain = "0.12" diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs index 7f2c6a17c1..8446ce4721 100644 --- a/mullvad-ipc-client/src/lib.rs +++ b/mullvad-ipc-client/src/lib.rs @@ -1,39 +1,27 @@ -extern crate log; #[macro_use] extern crate error_chain; -extern crate jsonrpc_client_core; -extern crate jsonrpc_client_ipc; - -extern crate futures; -extern crate mullvad_paths; -extern crate mullvad_types; -extern crate serde; -extern crate talpid_ipc; -extern crate talpid_types; -extern crate tokio; -extern crate tokio_timer; - -use std::path::Path; -use std::sync::mpsc; -use std::thread; -use std::time::Duration; - -use mullvad_types::account::{AccountData, AccountToken}; -use mullvad_types::location::GeoIpLocation; -use mullvad_types::relay_constraints::{RelaySettings, RelaySettingsUpdate}; -use mullvad_types::relay_list::RelayList; -use mullvad_types::settings::Settings; -use mullvad_types::version::AppVersionInfo; -use serde::{Deserialize, Serialize}; -use talpid_types::net::{OpenVpnProxySettings, TunnelOptions}; -use talpid_types::tunnel::TunnelStateTransition; - -use futures::stream::{self, Stream}; -use futures::sync::oneshot; +use futures::{ + stream::{self, Stream}, + sync::oneshot, +}; use jsonrpc_client_core::{Client, ClientHandle, Future}; pub use jsonrpc_client_core::{Error as RpcError, ErrorKind as RpcErrorKind}; use jsonrpc_client_ipc::IpcTransport; +use mullvad_types::{ + account::{AccountData, AccountToken}, + location::GeoIpLocation, + relay_constraints::{RelaySettings, RelaySettingsUpdate}, + relay_list::RelayList, + settings::Settings, + version::AppVersionInfo, +}; +use serde::{Deserialize, Serialize}; +use std::{path::Path, sync::mpsc, thread, time::Duration}; +use talpid_types::{ + net::{OpenVpnProxySettings, TunnelOptions}, + tunnel::TunnelStateTransition, +}; error_chain! { errors { |