diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-02-11 11:48:27 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-02-11 11:48:27 +0100 |
| commit | 93db2dd6ec59be66bd9219b2a244b3958f885662 (patch) | |
| tree | f68f47f076f6df5010e85d8414866ba0ca5acd7c | |
| parent | 6962158546a4e86e4dee994ba6be9be871e8f74c (diff) | |
| parent | 0c89aa092497a711bee1abe310eb94b511add058 (diff) | |
| download | mullvadvpn-93db2dd6ec59be66bd9219b2a244b3958f885662.tar.xz mullvadvpn-93db2dd6ec59be66bd9219b2a244b3958f885662.zip | |
Merge branch 'fix-rust-nightly'
| -rw-r--r-- | mullvad-cli/src/cmds/bridge.rs | 6 | ||||
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 2 | ||||
| -rw-r--r-- | mullvad-types/src/wireguard.rs | 2 | ||||
| -rw-r--r-- | talpid-types/src/net/proxy.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs index b6692d0198..d55e08a946 100644 --- a/mullvad-cli/src/cmds/bridge.rs +++ b/mullvad-cli/src/cmds/bridge.rs @@ -285,7 +285,7 @@ impl Bridge { }; let packed_proxy = openvpn::ProxySettings::Local(local_proxy); if let Err(error) = openvpn::validate_proxy_settings(&packed_proxy) { - panic!(error); + panic!("{}", error); } let mut rpc = new_rpc_client().await?; @@ -324,7 +324,7 @@ impl Bridge { let packed_proxy = openvpn::ProxySettings::Remote(proxy); if let Err(error) = openvpn::validate_proxy_settings(&packed_proxy) { - panic!(error); + panic!("{}", error); } let mut rpc = new_rpc_client().await?; @@ -353,7 +353,7 @@ impl Bridge { let packed_proxy = openvpn::ProxySettings::Shadowsocks(proxy); if let Err(error) = openvpn::validate_proxy_settings(&packed_proxy) { - panic!(error); + panic!("{}", error); } let mut rpc = new_rpc_client().await?; diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index 867f1c311e..dfb2459e77 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -170,8 +170,8 @@ pub struct TunnelOptions { } /// Custom DNS config -#[serde(default)] #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)] +#[serde(default)] #[cfg_attr(target_os = "android", derive(FromJava, IntoJava))] #[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] pub struct DnsOptions { diff --git a/mullvad-types/src/wireguard.rs b/mullvad-types/src/wireguard.rs index dce0fb74de..aabe7808ef 100644 --- a/mullvad-types/src/wireguard.rs +++ b/mullvad-types/src/wireguard.rs @@ -44,8 +44,8 @@ pub struct AssociatedAddresses { } /// Event that is emitted when the daemon has finished generating a key. -#[serde(rename_all = "snake_case")] #[derive(Clone, Debug, Deserialize, Serialize)] +#[serde(rename_all = "snake_case")] #[cfg_attr(target_os = "android", derive(IntoJava))] #[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] pub enum KeygenEvent { diff --git a/talpid-types/src/net/proxy.rs b/talpid-types/src/net/proxy.rs index 73e87915c4..c21de98fd9 100644 --- a/talpid-types/src/net/proxy.rs +++ b/talpid-types/src/net/proxy.rs @@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize}; use std::fmt; /// Types of bridges that can be used to proxy a connection to a tunnel -#[serde(rename_all = "snake_case")] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] pub enum ProxyType { Shadowsocks, Custom, |