diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-11-04 11:04:33 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-11-04 11:13:35 +0100 |
| commit | d3466776256d37c46de3ed4457b165f3dbcb9783 (patch) | |
| tree | d352e5611c9a938d79d77977a94bb60679a42edf /talpid-core/src | |
| parent | 6e1a3f39e5f9bdede3080ebb21fee5200d3277d8 (diff) | |
| download | mullvadvpn-d3466776256d37c46de3ed4457b165f3dbcb9783.tar.xz mullvadvpn-d3466776256d37c46de3ed4457b165f3dbcb9783.zip | |
Upgrade the which crate to 3.1 to get rid of failure dependency
Diffstat (limited to 'talpid-core/src')
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index 1f494cbe88..b1e35041a0 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -7,8 +7,6 @@ use crate::{ }, proxy::{self, ProxyMonitor, ProxyResourceData}, }; -#[cfg(target_os = "linux")] -use failure::ResultExt as FailureResultExt; use std::{ collections::HashMap, fs, @@ -64,7 +62,7 @@ pub enum Error { /// The IP routing program was not found. #[cfg(target_os = "linux")] #[error(display = "The IP routing program `ip` was not found")] - IpRouteNotFound(#[error(source)] failure::Compat<which::Error>), + IpRouteNotFound(#[error(source)] which::Error), /// The OpenVPN binary was not found. #[error(display = "No OpenVPN binary found at {}", _0)] @@ -447,11 +445,7 @@ impl<C: OpenVpnBuilder + 'static> OpenVpnMonitor<C> { cmd.config(config); } #[cfg(target_os = "linux")] - cmd.iproute_bin( - which::which("ip") - .compat() - .map_err(Error::IpRouteNotFound)?, - ); + cmd.iproute_bin(which::which("ip").map_err(Error::IpRouteNotFound)?); cmd.remote(params.config.endpoint) .user_pass(user_pass_file) .tunnel_options(¶ms.options) |
