summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-27 18:44:41 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-28 19:18:44 +0000
commit7ddadd632594b48be3eb4eb49de0cf91985d1219 (patch)
tree761b718fc5fe5e3330cdc4cf955eb650de18f55f /mullvad-daemon/src
parentc1260293da1e6f876dd4c67db28fd1f98af42a0a (diff)
downloadmullvadvpn-7ddadd632594b48be3eb4eb49de0cf91985d1219.tar.xz
mullvadvpn-7ddadd632594b48be3eb4eb49de0cf91985d1219.zip
Replace `TunnelState` alias with a new type
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index b2239cf7fd..eacb9a2197 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -152,7 +152,7 @@ impl DaemonExecutionState {
match self {
Running => {
match tunnel_state {
- TunnelStateTransition::Disconnected => mem::replace(self, Finished),
+ TunnelState::Disconnected => mem::replace(self, Finished),
_ => mem::replace(self, Exiting),
};
}
@@ -388,7 +388,7 @@ where
let mut daemon = Daemon {
tunnel_command_tx: Sink::wait(tunnel_command_tx),
- tunnel_state: TunnelStateTransition::Disconnected,
+ tunnel_state: TunnelState::Disconnected,
target_state: TargetState::Unsecured,
state: DaemonExecutionState::Running,
rx: internal_event_rx,
@@ -779,7 +779,7 @@ where
}
fn on_get_current_location(&self, tx: oneshot::Sender<Option<GeoIpLocation>>) {
- use self::TunnelStateTransition::*;
+ use self::TunnelState::*;
let get_location: Box<dyn Future<Item = Option<GeoIpLocation>, Error = ()> + Send> =
match self.tunnel_state {
Disconnected => Box::new(self.get_geo_location().map(Some)),