diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-08-29 13:14:58 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-08-29 13:14:58 +0200 |
| commit | ef4ef3846b621013fa9d29b77e9399153064f7d0 (patch) | |
| tree | 52b6cb7829421d8db3d0a70b381ed6990e2ebe33 /talpid-core/src | |
| parent | 3bca72f9f698eafb75c3c9e0490096a4fbafb9fb (diff) | |
| parent | b5594552dd9205b1edda27fe692d48eb39f267b2 (diff) | |
| download | mullvadvpn-ef4ef3846b621013fa9d29b77e9399153064f7d0.tar.xz mullvadvpn-ef4ef3846b621013fa9d29b77e9399153064f7d0.zip | |
Merge branch 'fix-clippy-fail'
Diffstat (limited to 'talpid-core/src')
| -rw-r--r-- | talpid-core/src/tunnel/openvpn/mod.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/stats.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/disconnecting_state.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/error_state.rs | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/talpid-core/src/tunnel/openvpn/mod.rs b/talpid-core/src/tunnel/openvpn/mod.rs index 95bcac3295..8a8581df40 100644 --- a/talpid-core/src/tunnel/openvpn/mod.rs +++ b/talpid-core/src/tunnel/openvpn/mod.rs @@ -826,6 +826,7 @@ mod event_server { Request, Response, }; + #[allow(clippy::derive_partial_eq_without_eq)] mod proto { tonic::include_proto!("talpid_openvpn_plugin"); } diff --git a/talpid-core/src/tunnel/wireguard/stats.rs b/talpid-core/src/tunnel/wireguard/stats.rs index cec033f611..bd7b578545 100644 --- a/talpid-core/src/tunnel/wireguard/stats.rs +++ b/talpid-core/src/tunnel/wireguard/stats.rs @@ -17,7 +17,7 @@ pub enum Error { } /// Contains bytes sent and received through a tunnel -#[derive(Default, Debug, PartialEq, Clone, Copy)] +#[derive(Default, Debug, PartialEq, Eq, Clone, Copy)] pub struct Stats { pub tx_bytes: u64, pub rx_bytes: u64, diff --git a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs index 8e7e85fd36..954de76034 100644 --- a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs @@ -78,7 +78,7 @@ impl DisconnectingState { } Some(TunnelCommand::IsOffline(is_offline)) => { shared_values.is_offline = is_offline; - if !is_offline && reason == ErrorStateCause::IsOffline { + if !is_offline && matches!(reason, ErrorStateCause::IsOffline) { AfterDisconnect::Reconnect(0) } else { AfterDisconnect::Block(reason) diff --git a/talpid-core/src/tunnel_state_machine/error_state.rs b/talpid-core/src/tunnel_state_machine/error_state.rs index a11e49d859..b12beecff4 100644 --- a/talpid-core/src/tunnel_state_machine/error_state.rs +++ b/talpid-core/src/tunnel_state_machine/error_state.rs @@ -178,7 +178,7 @@ impl TunnelState for ErrorState { } Some(TunnelCommand::IsOffline(is_offline)) => { shared_values.is_offline = is_offline; - if !is_offline && self.block_reason == ErrorStateCause::IsOffline { + if !is_offline && matches!(self.block_reason, ErrorStateCause::IsOffline) { Self::reset_dns(shared_values); NewState(ConnectingState::enter(shared_values, 0)) } else { |