diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-11-06 13:49:41 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-11-06 13:49:41 +0100 |
| commit | 70b8800d19d856eddb6c7c837e62d620e7cc0878 (patch) | |
| tree | d2b9c4de3843a827e4db9d603968a8249fdf9d08 | |
| parent | 93c2cd0add3208ecc70e78986491c12ff8009fc4 (diff) | |
| parent | b51b4c687bb6fbc74e7a446e921b5157e2d27d14 (diff) | |
| download | mullvadvpn-70b8800d19d856eddb6c7c837e62d620e7cc0878.tar.xz mullvadvpn-70b8800d19d856eddb6c7c837e62d620e7cc0878.zip | |
Merge branch 'respect-rustflags'
| -rwxr-xr-x | ci/ci-rust-script.sh | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index 1afeaefa8e..910b32f381 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -3,7 +3,7 @@ set -eux RUST_TOOLCHAIN_CHANNEL=$1 -RUSTFLAGS="--deny unused_imports --deny dead_code" +export RUSTFLAGS="--deny unused_imports --deny dead_code" source env.sh "" diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index efc75f3cbb..f87b96382f 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -27,7 +27,7 @@ use talpid_types::{ ErrorExt, }; - +#[cfg(target_os = "android")] const MAX_ATTEMPTS_WITH_SAME_TUN: u32 = 5; const MIN_TUNNEL_ALIVE_TIME: Duration = Duration::from_millis(1000); |