diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-26 09:56:54 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-26 09:56:54 -0300 |
| commit | 282a72a8b33c430e3ea47843eafeec7e41d7806c (patch) | |
| tree | e8ce12acf9f5629ae78c537532b3c459bc812555 | |
| parent | 0e66e7084d0e070a6ff179bd971a84e37483bdfd (diff) | |
| parent | 6142a889ad11a832ace13b0925d4bf53f6c5ae98 (diff) | |
| download | mullvadvpn-282a72a8b33c430e3ea47843eafeec7e41d7806c.tar.xz mullvadvpn-282a72a8b33c430e3ea47843eafeec7e41d7806c.zip | |
Merge branch 'fix-recursion-in-default-impl'
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 8f57bb58fa..d9b1f80390 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -185,6 +185,7 @@ impl RelaySettings { #[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] pub struct RelayConstraints { pub location: Constraint<LocationConstraint>, + #[cfg_attr(target_os = "android", jnix(skip))] pub provider: Constraint<Provider>, #[cfg_attr(target_os = "android", jnix(skip))] pub tunnel_protocol: Constraint<TunnelType>, @@ -199,7 +200,10 @@ impl Default for RelayConstraints { fn default() -> Self { RelayConstraints { tunnel_protocol: Constraint::Only(TunnelType::Wireguard), - ..Default::default() + location: Constraint::default(), + provider: Constraint::default(), + wireguard_constraints: WireguardConstraints::default(), + openvpn_constraints: OpenVpnConstraints::default(), } } } |