diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-01-07 13:21:03 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-01-07 13:21:03 +0100 |
| commit | cb312bb061a958f45d91966ae22acebd5404a41c (patch) | |
| tree | 70ec95ca9a60e8cab853f430fc52a1176f141de6 | |
| parent | 90f84c1489b51dfdf02252c9250120dcef943304 (diff) | |
| parent | f2b3f49966a236572b1186f5da72964e092ebf83 (diff) | |
| download | mullvadvpn-cb312bb061a958f45d91966ae22acebd5404a41c.tar.xz mullvadvpn-cb312bb061a958f45d91966ae22acebd5404a41c.zip | |
Merge branch 'deny-unused-variables'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/ci-rust-script.sh | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/android.rs | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 676cf27d9a..37cdddaf58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ matrix: ar = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" linker = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" before_script: - - export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut" + - export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut --deny unused_variables" - export AR_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android-ar - export CC_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android21-clang - source env.sh aarch64-linux-android diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index 69fa837186..7fc7c26eab 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -3,7 +3,7 @@ set -eux RUST_TOOLCHAIN_CHANNEL=$1 -export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut" +export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut --deny unused_variables" source env.sh "" diff --git a/talpid-core/src/tunnel/tun_provider/android.rs b/talpid-core/src/tunnel/tun_provider/android.rs index 84526cd709..487598332c 100644 --- a/talpid-core/src/tunnel/tun_provider/android.rs +++ b/talpid-core/src/tunnel/tun_provider/android.rs @@ -134,7 +134,6 @@ impl AndroidTunProvider { .map_err(Error::Select)? > 0 { - let elapsed = start.elapsed(); return Ok(()); } // have to add tun_fd back into the bitset |