diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-08-26 15:24:49 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-08-26 15:24:49 +0200 |
| commit | 77665dc8451d6a6789366efdf31f1afc6cd2559b (patch) | |
| tree | 6dab13669d3d162949f6b68c69aa0f187dcf5619 | |
| parent | 282a72a8b33c430e3ea47843eafeec7e41d7806c (diff) | |
| parent | 12171d5c4322407f729fab1989ee1c8eb44a9328 (diff) | |
| download | mullvadvpn-77665dc8451d6a6789366efdf31f1afc6cd2559b.tar.xz mullvadvpn-77665dc8451d6a6789366efdf31f1afc6cd2559b.zip | |
Merge branch 'deny-unconditional_recursion-warning'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/ci-rust-script.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ea0f6c0e77..7654f4945a 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 --deny unused_parens" + - export RUSTFLAGS="--deny warnings" - 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 f6f6b4f51f..f3417da8db 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 --deny unused_parens" +export RUSTFLAGS="--deny warnings" source env.sh |