diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-03-27 17:06:08 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-03-27 17:06:08 +0100 |
| commit | 46ed3bad2a4867f62be6140535cce16f792c5950 (patch) | |
| tree | 6bfb0f702a0b80ebae731f0550601ad4ef508c11 | |
| parent | fd23cf6797be5677320bb2ddd6666704d92af613 (diff) | |
| parent | b9465917a5971a5d4715ebbdee3f4ffd8a44f71e (diff) | |
| download | mullvadvpn-46ed3bad2a4867f62be6140535cce16f792c5950.tar.xz mullvadvpn-46ed3bad2a4867f62be6140535cce16f792c5950.zip | |
Merge branch 'deny-unused-parens'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/ci-rust-script.sh | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d75202d98f..c07899c3c9 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 --deny unused_variables" + - export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut --deny unused_variables --deny unused_parens" - 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 90863cc90d..9df86c0f39 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 --deny unused_variables" +export RUSTFLAGS="--deny unused_imports --deny dead_code --deny unused_mut --deny unused_variables --deny unused_parens" source env.sh "" diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index f81110badb..4c9111d468 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -359,9 +359,8 @@ impl RelaySelector { (relay.location.as_ref().unwrap().distance_from(&location) * 1000.0) as i64 }); matching_relays.get(0).and_then(|relay| { - (self - .pick_random_bridge(&relay) - .map(|bridge| (bridge, relay.clone()))) + self.pick_random_bridge(&relay) + .map(|bridge| (bridge, relay.clone())) }) } |