diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-06-19 09:32:35 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-06-21 03:29:44 +0200 |
| commit | 0639b4b6fdbd16b640dafd39c160db5e342788e9 (patch) | |
| tree | 1abe8dc9cda84449a85bf01147ebf64337e5618a /mullvad_daemon/src/management_interface.rs | |
| parent | 22a73df71fc6d028d84b54776d6f5e7c7066da27 (diff) | |
| download | mullvadvpn-0639b4b6fdbd16b640dafd39c160db5e342788e9.tar.xz mullvadvpn-0639b4b6fdbd16b640dafd39c160db5e342788e9.zip | |
Renamed plexmpsc to mpsc and Sender to IntoSender
Diffstat (limited to 'mullvad_daemon/src/management_interface.rs')
| -rw-r--r-- | mullvad_daemon/src/management_interface.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad_daemon/src/management_interface.rs b/mullvad_daemon/src/management_interface.rs index 6f5067c9cc..6c41c85793 100644 --- a/mullvad_daemon/src/management_interface.rs +++ b/mullvad_daemon/src/management_interface.rs @@ -11,7 +11,7 @@ use std::collections::hash_map::Entry; use std::net::{IpAddr, Ipv4Addr}; use std::sync::{Arc, Mutex, RwLock}; -use talpid_core::plexmpsc; +use talpid_core::mpsc::IntoSender; use talpid_ipc; use uuid; @@ -110,7 +110,7 @@ pub struct ManagementInterfaceServer { } impl ManagementInterfaceServer { - pub fn start<T>(tunnel_tx: plexmpsc::Sender<TunnelCommand, T>) -> talpid_ipc::Result<Self> + pub fn start<T>(tunnel_tx: IntoSender<TunnelCommand, T>) -> talpid_ipc::Result<Self> where T: From<TunnelCommand> + 'static + Send { let rpc = ManagementInterface::new(tunnel_tx); @@ -160,11 +160,11 @@ impl EventBroadcaster { struct ManagementInterface<T: From<TunnelCommand> + 'static + Send> { active_subscriptions: ActiveSubscriptions, - tx: Mutex<plexmpsc::Sender<TunnelCommand, T>>, + tx: Mutex<IntoSender<TunnelCommand, T>>, } impl<T: From<TunnelCommand> + 'static + Send> ManagementInterface<T> { - pub fn new(tx: plexmpsc::Sender<TunnelCommand, T>) -> Self { + pub fn new(tx: IntoSender<TunnelCommand, T>) -> Self { ManagementInterface { active_subscriptions: Default::default(), tx: Mutex::new(tx), |
