summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-21 15:31:34 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-24 12:45:04 +0000
commitc22f4cc8724b02243e8f266677a4c0b24cfc938e (patch)
tree0d2a971da89ec7cc3d0879bbcd8705dd7a1144a1
parentec5549a908c580aff9db9218800b0f73fcbe2b6c (diff)
downloadmullvadvpn-c22f4cc8724b02243e8f266677a4c0b24cfc938e.tar.xz
mullvadvpn-c22f4cc8724b02243e8f266677a4c0b24cfc938e.zip
Remove unnecessary `Mutex`
-rw-r--r--mullvad-daemon/src/management_interface.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 22358881ed..3bc2196f44 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -21,7 +21,7 @@ use mullvad_types::{
states::{TargetState, TunnelState},
version, wireguard, DaemonEvent,
};
-use parking_lot::{Mutex, RwLock};
+use parking_lot::RwLock;
use std::{
collections::{hash_map::Entry, HashMap},
sync::Arc,
@@ -365,14 +365,14 @@ impl Drop for ManagementInterfaceEventBroadcaster {
struct ManagementInterface<T: From<ManagementCommand> + 'static + Send> {
subscriptions: Arc<RwLock<HashMap<SubscriptionId, pubsub::Sink<DaemonEvent>>>>,
- tx: Mutex<IntoSender<ManagementCommand, T>>,
+ tx: IntoSender<ManagementCommand, T>,
}
impl<T: From<ManagementCommand> + 'static + Send> ManagementInterface<T> {
pub fn new(tx: IntoSender<ManagementCommand, T>) -> Self {
ManagementInterface {
subscriptions: Default::default(),
- tx: Mutex::new(tx),
+ tx,
}
}
@@ -381,7 +381,7 @@ impl<T: From<ManagementCommand> + 'static + Send> ManagementInterface<T> {
&self,
command: ManagementCommand,
) -> impl Future<Item = (), Error = Error> {
- future::result(self.tx.lock().send(command)).map_err(|_| Error::internal_error())
+ future::result(self.tx.send(command)).map_err(|_| Error::internal_error())
}
/// Converts the given error to an error that can be given to the caller of the API.