summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-10-29 16:34:23 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-10-29 16:34:23 +0100
commit7e4eb3711be85e084dfbf65d090b94f482f084c1 (patch)
tree52a27abeb3f967a44d577bd621fdf3ab4aab2ca6 /mullvad-daemon/src
parentda2c819a0338f652889f17bb6e3f7924d0eb956c (diff)
downloadmullvadvpn-7e4eb3711be85e084dfbf65d090b94f482f084c1.tar.xz
mullvadvpn-7e4eb3711be85e084dfbf65d090b94f482f084c1.zip
Remove #[macro_use] from jsonrpc_macros and jsonrpc_client_core
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/lib.rs3
-rw-r--r--mullvad-daemon/src/management_interface.rs5
2 files changed, 3 insertions, 5 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index ee6dae4aba..13ae19e7a7 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -19,9 +19,8 @@ extern crate serde;
extern crate serde_json;
extern crate jsonrpc_core;
-#[macro_use]
-extern crate jsonrpc_macros;
extern crate jsonrpc_ipc_server;
+extern crate jsonrpc_macros;
extern crate jsonrpc_pubsub;
extern crate rand;
extern crate tokio_core;
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 302dafb2ae..07fd603e2a 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -3,13 +3,12 @@ use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
use jsonrpc_core::futures::{future, sync, Future};
use jsonrpc_core::{Error, ErrorCode, MetaIoHandler, Metadata};
use jsonrpc_ipc_server;
-use jsonrpc_macros::pubsub;
+use jsonrpc_macros::{build_rpc_trait, metadata, pubsub};
use jsonrpc_pubsub::{PubSubHandler, PubSubMetadata, Session, SubscriptionId};
+use mullvad_paths;
use mullvad_rpc;
use mullvad_types::account::{AccountData, AccountToken};
use mullvad_types::location::GeoIpLocation;
-
-use mullvad_paths;
use mullvad_types::relay_constraints::RelaySettingsUpdate;
use mullvad_types::relay_list::RelayList;
use mullvad_types::settings::Settings;