summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSebastian Holmin <sebastian.holmin@mullvad.net>2024-09-06 13:01:57 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-09-06 13:47:01 +0200
commit1ae1d061d38d53a2b4f0dd49229e64fcfe331650 (patch)
tree12b92068c7d0ad2063c31458972238c1c534964d
parent5c07062c369b12f827f6e8502afd055badd0b261 (diff)
downloadmullvadvpn-1ae1d061d38d53a2b4f0dd49229e64fcfe331650.tar.xz
mullvadvpn-1ae1d061d38d53a2b4f0dd49229e64fcfe331650.zip
Replace `map_err` with `inspect_err` on windows
-rw-r--r--talpid-core/src/split_tunnel/windows/mod.rs9
1 files changed, 3 insertions, 6 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