summaryrefslogtreecommitdiffhomepage
path: root/talpid-openvpn-plugin
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 /talpid-openvpn-plugin
parentda2c819a0338f652889f17bb6e3f7924d0eb956c (diff)
downloadmullvadvpn-7e4eb3711be85e084dfbf65d090b94f482f084c1.tar.xz
mullvadvpn-7e4eb3711be85e084dfbf65d090b94f482f084c1.zip
Remove #[macro_use] from jsonrpc_macros and jsonrpc_client_core
Diffstat (limited to 'talpid-openvpn-plugin')
-rw-r--r--talpid-openvpn-plugin/src/lib.rs3
-rw-r--r--talpid-openvpn-plugin/src/processing.rs17
2 files changed, 8 insertions, 12 deletions
diff --git a/talpid-openvpn-plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs
index 11e87c7839..db0e3bf41c 100644
--- a/talpid-openvpn-plugin/src/lib.rs
+++ b/talpid-openvpn-plugin/src/lib.rs
@@ -11,9 +11,8 @@ extern crate env_logger;
extern crate error_chain;
extern crate log;
-#[macro_use]
-extern crate jsonrpc_client_core;
extern crate futures;
+extern crate jsonrpc_client_core;
extern crate jsonrpc_client_ipc;
extern crate openvpn_plugin;
extern crate tokio;
diff --git a/talpid-openvpn-plugin/src/processing.rs b/talpid-openvpn-plugin/src/processing.rs
index ae2cbb7526..5ac6bed8d3 100644
--- a/talpid-openvpn-plugin/src/processing.rs
+++ b/talpid-openvpn-plugin/src/processing.rs
@@ -1,16 +1,13 @@
-use openvpn_plugin;
-use std::collections::HashMap;
-
extern crate futures;
-use jsonrpc_client_core::{Future, Result as ClientResult, Transport};
-use jsonrpc_client_ipc::IpcTransport;
-
-use tokio::reactor::Handle;
-use tokio::runtime::Runtime;
-
use super::Arguments;
-use std::thread;
+use jsonrpc_client_core::{
+ expand_params, jsonrpc_client, Future, Result as ClientResult, Transport,
+};
+use jsonrpc_client_ipc::IpcTransport;
+use openvpn_plugin;
+use std::{collections::HashMap, thread};
+use tokio::{reactor::Handle, runtime::Runtime};
error_chain! {
errors {