diff options
| -rw-r--r-- | mullvad-daemon/src/main.rs | 4 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index deb3d184f2..04797ea8a1 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -36,10 +36,10 @@ mod settings; mod shutdown; use error_chain::ChainedError; -use futures::{BoxFuture, Future}; +use futures::Future; use jsonrpc_client_http::HttpHandle; use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender; -use management_interface::{ManagementInterfaceServer, TunnelCommand}; +use management_interface::{BoxFuture, ManagementInterfaceServer, TunnelCommand}; use master::AccountsProxy; use mullvad_types::account::{AccountData, AccountToken}; use mullvad_types::states::{DaemonState, SecurityState, TargetState}; diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index 47a2c81d33..ab1c4deee9 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -2,7 +2,7 @@ use error_chain; use jsonrpc_client_core; use jsonrpc_core::{Error, ErrorCode, Metadata}; -use jsonrpc_core::futures::{BoxFuture, Future, future, sync}; +use jsonrpc_core::futures::{Future, future, sync}; use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender; use jsonrpc_macros::pubsub; use jsonrpc_pubsub::{PubSubHandler, PubSubMetadata, Session, SubscriptionId}; @@ -22,6 +22,10 @@ use talpid_core::mpsc::IntoSender; use talpid_ipc; use uuid; +/// FIXME(linus): This is here just because the futures crate has deprecated it and jsonrpc_core +/// did not introduce their own yet (https://github.com/paritytech/jsonrpc/pull/196). +/// Remove this and use the one in jsonrpc_core when that is released. +pub type BoxFuture<T, E> = Box<Future<Item = T, Error = E> + Send>; build_rpc_trait! { pub trait ManagementInterfaceApi { |