diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-15 20:47:17 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-22 13:46:49 +0000 |
| commit | 0f41a5f1543a0a986888162cf490e47754d80414 (patch) | |
| tree | 20367e64ade271b2be2d96d4f83c59416c2f9ef0 | |
| parent | a9ccc386eeebab549fd20230a2ee131877422f15 (diff) | |
| download | mullvadvpn-0f41a5f1543a0a986888162cf490e47754d80414.tar.xz mullvadvpn-0f41a5f1543a0a986888162cf490e47754d80414.zip | |
Remove unused error variant
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 9 | ||||
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index e0f7a94b4e..00254472be 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -13,7 +13,7 @@ use mullvad_types::{ location::GeoIpLocation, relay_constraints::{BridgeSettings, BridgeState, RelaySettingsUpdate}, relay_list::RelayList, - settings::{self, Settings}, + settings::Settings, states::{TargetState, TunnelState}, version, wireguard, DaemonEvent, }; @@ -582,12 +582,7 @@ impl ManagementInterfaceApi for ManagementInterface { let future = self .send_command_to_daemon(DaemonCommand::SetBridgeSettings(tx, bridge_settings)) .and_then(|_| rx.map_err(|_| Error::internal_error())) - .and_then(|settings_result| { - settings_result.map_err(|error| match error { - settings::Error::InvalidProxyData(reason) => Error::invalid_params(reason), - _ => Error::internal_error(), - }) - }); + .and_then(|settings_result| settings_result.map_err(|_| Error::internal_error())); Box::new(future) } diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index b7beecac85..edc6de94c6 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -42,9 +42,6 @@ pub enum Error { #[error(display = "Unable to write settings to {}", _0)] WriteError(String, #[error(source)] io::Error), - #[error(display = "Invalid OpenVPN proxy configuration: {}", _0)] - InvalidProxyData(String), - #[error(display = "Unable to read any version of the settings")] NoMatchingVersion, } |
