diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-01 16:59:42 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-01 16:59:42 +0200 |
| commit | f215499e05913b6e72959a3e6a3151fe977f994d (patch) | |
| tree | 45ee7f84428a770832af5da74344eef473f652dc | |
| parent | d7c69a9a6ca958d41c4475f3079ab3b986cb3531 (diff) | |
| parent | 17c34c1217439faa73621a92a9cbbc26fb0827e5 (diff) | |
| download | mullvadvpn-f215499e05913b6e72959a3e6a3151fe977f994d.tar.xz mullvadvpn-f215499e05913b6e72959a3e6a3151fe977f994d.zip | |
Merge branch 'simplify-cfg-if'
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connected_state.rs | 11 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 11 |
4 files changed, 8 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index 005ae04ef3..fe175b922a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3620,7 +3620,6 @@ dependencies = [ "async-trait", "bitflags", "byteorder", - "cfg-if", "chrono", "duct", "err-derive", diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 25cbbf77c1..d069f3fd6d 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -11,7 +11,6 @@ publish.workspace = true [dependencies] bitflags = "1.2" async-trait = "0.1" -cfg-if = "1.0" duct = "0.13" err-derive = "0.3.1" futures = "0.3.15" diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs index 2080416cad..fadbbe9e67 100644 --- a/talpid-core/src/tunnel_state_machine/connected_state.rs +++ b/talpid-core/src/tunnel_state_machine/connected_state.rs @@ -7,7 +7,6 @@ use crate::{ firewall::FirewallPolicy, tunnel::{TunnelEvent, TunnelMetadata}, }; -use cfg_if::cfg_if; use futures::{ channel::{mpsc, oneshot}, stream::Fuse, @@ -194,12 +193,10 @@ impl ConnectedState { } else { match self.set_firewall_policy(shared_values) { Ok(()) => { - cfg_if! { - if #[cfg(target_os = "android")] { - self.disconnect(shared_values, AfterDisconnect::Reconnect(0)) - } else { - SameState(self.into()) - } + if cfg!(target_os = "android") { + self.disconnect(shared_values, AfterDisconnect::Reconnect(0)) + } else { + SameState(self.into()) } } Err(error) => self.disconnect( diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 8f1dafe2bf..44b61772d6 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -7,7 +7,6 @@ use crate::{ firewall::FirewallPolicy, tunnel::{self, TunnelMonitor}, }; -use cfg_if::cfg_if; use futures::{ channel::{mpsc, oneshot}, future::Fuse, @@ -301,12 +300,10 @@ impl ConnectingState { self.allowed_tunnel_traffic.clone(), ) { Ok(()) => { - cfg_if! { - if #[cfg(target_os = "android")] { - self.disconnect(shared_values, AfterDisconnect::Reconnect(0)) - } else { - EventConsequence::SameState(self.into()) - } + if cfg!(target_os = "android") { + self.disconnect(shared_values, AfterDisconnect::Reconnect(0)) + } else { + EventConsequence::SameState(self.into()) } } Err(error) => self.disconnect( |