summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-03-06 11:37:32 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-03-06 19:13:50 +0100
commit2ae706231d6fc09f61d2eda5fc15c5b6596dde3c (patch)
tree7654effac298f9d83ed42bd2498cc7dd1417f861 /mullvad-daemon/src
parentc3e442622c17e642d8cb1c9ba6f3b604ce5120c0 (diff)
downloadmullvadvpn-2ae706231d6fc09f61d2eda5fc15c5b6596dde3c.tar.xz
mullvadvpn-2ae706231d6fc09f61d2eda5fc15c5b6596dde3c.zip
Upgrade jsonrpc-* crates
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/management_interface.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 8d6c2ebbc4..c0463f58a6 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -1,7 +1,7 @@
use error_chain;
use error_chain::ChainedError;
-use jsonrpc_core::{Error, ErrorCode, Metadata};
+use jsonrpc_core::{Error, ErrorCode, MetaIoHandler, Metadata};
use jsonrpc_core::futures::{future, sync, Future};
use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
use jsonrpc_macros::pubsub;
@@ -193,7 +193,8 @@ impl ManagementInterfaceServer {
let mut io = PubSubHandler::default();
io.extend_with(rpc.to_delegate());
- let server = talpid_ipc::IpcServer::start_with_metadata(io.into(), meta_extractor)?;
+ let meta_io: MetaIoHandler<Meta> = io.into();
+ let server = talpid_ipc::IpcServer::start_with_metadata(meta_io, meta_extractor)?;
Ok(ManagementInterfaceServer {
server,
subscriptions,