summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-03-20 10:50:47 +0100
committerLinus Färnstrand <linus@mullvad.net>2019-03-20 10:50:47 +0100
commita15262e47c100160c1547a3c3294592e236cb7b7 (patch)
treef4031d432b17b3b5b5acc913344b8c53a9b1d5f6
parentd2cb0081aa28588d873631b4b2315526814e2b5d (diff)
downloadmullvadvpn-a15262e47c100160c1547a3c3294592e236cb7b7.tar.xz
mullvadvpn-a15262e47c100160c1547a3c3294592e236cb7b7.zip
Replace some openvpn module unwraps with expect
-rw-r--r--talpid-core/src/tunnel/openvpn.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index 7af5f6c63e..39dd3f2a93 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -153,7 +153,7 @@ impl OpenVpnMonitor<OpenVpnCommand> {
};
let log_dir: Option<PathBuf> = if let Some(ref log_path) = log_path {
- Some(log_path.parent().unwrap().into())
+ Some(log_path.parent().expect("log_path has no parent").into())
} else {
None
};
@@ -256,7 +256,7 @@ impl<C: OpenVpnBuilder + 'static> OpenVpnMonitor<C> {
let _ = tunnel_close_handle.close();
});
- let result = rx.recv().unwrap();
+ let result = rx.recv().expect("wait got no result");
let _ = rx.recv();
match result {
@@ -324,7 +324,7 @@ impl<C: OpenVpnBuilder + 'static> OpenVpnMonitor<C> {
let child_wait_handle = self.child.clone();
let closed_handle = self.closed.clone();
let child_close_handle = self.close_handle();
- let event_dispatcher = self.event_dispatcher.take().unwrap();
+ let event_dispatcher = self.event_dispatcher.take().expect("No event_dispatcher");
let dispatcher_handle = event_dispatcher.close_handle();
let (child_tx, rx) = mpsc::channel();
@@ -342,8 +342,8 @@ impl<C: OpenVpnBuilder + 'static> OpenVpnMonitor<C> {
let _ = child_close_handle.close();
});
- let result = rx.recv().unwrap();
- let _ = rx.recv().unwrap();
+ let result = rx.recv().expect("inner_wait_tunnel no result");
+ let _ = rx.recv().expect("inner_wait_tunnel no second result");
result
}