summaryrefslogtreecommitdiffhomepage
path: root/talpid-openvpn
diff options
context:
space:
mode:
authorSebastian Holmin <sebastian.holmin@mullvad.net>2024-01-04 05:46:23 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-01-05 17:02:12 +0100
commit5131624541f6a9f456de347b62f69f4c5591c5c4 (patch)
tree0d24ceecbf9299cb8c445d01a1c25f994d0067aa /talpid-openvpn
parent62df52bb1e7b81d44e0f7bd73ec2aa5882311db9 (diff)
downloadmullvadvpn-5131624541f6a9f456de347b62f69f4c5591c5c4.tar.xz
mullvadvpn-5131624541f6a9f456de347b62f69f4c5591c5c4.zip
Run `cargo +nightly fmt`
Diffstat (limited to 'talpid-openvpn')
-rw-r--r--talpid-openvpn/src/lib.rs3
-rw-r--r--talpid-openvpn/src/process/openvpn.rs4
2 files changed, 3 insertions, 4 deletions
diff --git a/talpid-openvpn/src/lib.rs b/talpid-openvpn/src/lib.rs
index 47d1bc675a..04f94a1a84 100644
--- a/talpid-openvpn/src/lib.rs
+++ b/talpid-openvpn/src/lib.rs
@@ -755,8 +755,7 @@ mod event_server {
task::{Context, Poll},
};
use talpid_tunnel::TunnelMetadata;
- use talpid_types::net::proxy::CustomProxy;
- use talpid_types::ErrorExt;
+ use talpid_types::{net::proxy::CustomProxy, ErrorExt};
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
use tonic::{
self,
diff --git a/talpid-openvpn/src/process/openvpn.rs b/talpid-openvpn/src/process/openvpn.rs
index 84b9c88534..c45c2c0a90 100644
--- a/talpid-openvpn/src/process/openvpn.rs
+++ b/talpid-openvpn/src/process/openvpn.rs
@@ -440,8 +440,8 @@ impl OpenVpnProcHandle {
})
}
- /// Begins to kill the process, causing `wait()` to return. This function does not wait for the operation
- /// to complete.
+ /// Begins to kill the process, causing `wait()` to return. This function does not wait for the
+ /// operation to complete.
pub fn kill(&mut self, timeout: std::time::Duration) {
if let Some(tx) = self.stop_tx.take() {
let _ = tx.send(timeout);