diff options
| author | Albin <albin@mullvad.net> | 2024-09-06 14:24:14 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-09-06 14:24:14 +0200 |
| commit | 8953c78366ab7ba95eb4726fc76c07b655113a36 (patch) | |
| tree | 12b92068c7d0ad2063c31458972238c1c534964d | |
| parent | e015870f821347a02e02519aa221282d07666a82 (diff) | |
| parent | 1ae1d061d38d53a2b4f0dd49229e64fcfe331650 (diff) | |
| download | mullvadvpn-8953c78366ab7ba95eb4726fc76c07b655113a36.tar.xz mullvadvpn-8953c78366ab7ba95eb4726fc76c07b655113a36.zip | |
Merge branch 'clippy-lint-macos'
| -rw-r--r-- | talpid-core/src/split_tunnel/windows/mod.rs | 9 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/mod.rs | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs index 68030691a9..1c446377fc 100644 --- a/talpid-core/src/split_tunnel/windows/mod.rs +++ b/talpid-core/src/split_tunnel/windows/mod.rs @@ -260,12 +260,11 @@ impl SplitTunnel { overlapped.as_mut_ptr(), ) } - .map_err(|error| { + .inspect_err(|error| { log::error!( "{}", error.display_chain_with_msg("DeviceIoControl failed to deque event") ); - error })?; let event_objects = [ @@ -274,13 +273,12 @@ impl SplitTunnel { ]; let signaled_object = - unsafe { driver::wait_for_multiple_objects(&event_objects[..], false) }.map_err( + unsafe { driver::wait_for_multiple_objects(&event_objects[..], false) }.inspect_err( |error| { log::error!( "{}", error.display_chain_with_msg("wait_for_multiple_objects failed") ); - error }, )?; @@ -290,7 +288,7 @@ impl SplitTunnel { } let returned_bytes = - driver::get_overlapped_result(device, overlapped).map_err(|error| { + driver::get_overlapped_result(device, overlapped).inspect_err(|error| { if error.raw_os_error() != Some(ERROR_OPERATION_ABORTED as i32) { log::error!( "{}", @@ -299,7 +297,6 @@ impl SplitTunnel { ), ); } - error })?; data_buffer diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs index 78a422564b..1deb226e04 100644 --- a/talpid-core/src/tunnel_state_machine/mod.rs +++ b/talpid-core/src/tunnel_state_machine/mod.rs @@ -498,12 +498,11 @@ impl SharedTunnelStateValues { self.split_tunnel .set_exclude_paths(paths.into_iter().map(PathBuf::from).collect()) .await - .map_err(|error| { + .inspect_err(|error| { log::error!( "{}", error.display_chain_with_msg("Failed to set split tunnel paths") ); - error })?; let has_interface = self.split_tunnel.interface().await.is_some(); Ok(had_interface != has_interface) |