summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-16 10:55:15 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-16 13:56:04 +0000
commita3a28d910fdd56c621d3a976f22919b91f5a6f80 (patch)
tree10b2a1b889838a0fa88fb96cf26e340ec51bc3fd
parent2cb04810c315c6386bac2721daff31394e5c080f (diff)
downloadmullvadvpn-a3a28d910fdd56c621d3a976f22919b91f5a6f80.tar.xz
mullvadvpn-a3a28d910fdd56c621d3a976f22919b91f5a6f80.zip
Ignore some unused variables on Android
-rw-r--r--talpid-core/src/tunnel/mod.rs1
-rw-r--r--talpid-core/src/tunnel_state_machine/connected_state.rs1
-rw-r--r--talpid-core/src/tunnel_state_machine/connecting_state.rs1
3 files changed, 3 insertions, 0 deletions
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 17b23b9e12..4d27be32ec 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -135,6 +135,7 @@ pub struct TunnelMonitor {
impl TunnelMonitor {
/// Creates a new `TunnelMonitor` that connects to the given remote and notifies `on_event`
/// on tunnel state changes.
+ #[cfg_attr(target_os = "android", allow(unused_variables))]
pub fn start<L>(
tunnel_parameters: &TunnelParameters,
log_dir: &Option<PathBuf>,
diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index f0dad2b581..324d2cbbc8 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -194,6 +194,7 @@ impl ConnectedState {
impl TunnelState for ConnectedState {
type Bootstrap = ConnectedStateBootstrap;
+ #[cfg_attr(target_os = "android", allow(unused_variables))]
fn enter(
shared_values: &mut SharedTunnelStateValues,
bootstrap: Self::Bootstrap,
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 8b9e6bbb63..66aee2d298 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -57,6 +57,7 @@ impl ConnectingState {
shared_values.firewall.apply_policy(policy)
}
+ #[cfg_attr(target_os = "android", allow(unused_variables))]
fn start_tunnel(
parameters: TunnelParameters,
log_dir: &Option<PathBuf>,