summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-10-04 03:40:18 +0000
committerGitHub <noreply@github.com>2021-10-04 03:40:18 +0000
commitc7a81931fb33cd2570797e5fbb73e102566fe91d (patch)
tree8262638a6978a497523218e7c72090c333f60f32
parentcc1528c1b6a3f96c4cc571b02d2ff585e3ffaed1 (diff)
parentfb1ae125d931b2de5bae05df614e8af565bf31c6 (diff)
downloadnix-c7a81931fb33cd2570797e5fbb73e102566fe91d.zip
Merge #1552
1552: Suppress a warning from the latest clippy r=asomers a=asomers Co-authored-by: Alan Somers <asomers@gmail.com>
-rw-r--r--.cirrus.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index c3d87611..3848f920 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,6 +5,7 @@ cargo_cache:
env:
# Build by default; don't just check
BUILD: build
+ CLIPPYFLAGS: -D warnings
RUSTFLAGS: -D warnings
RUSTDOCFLAGS: -D warnings
TOOL: cargo
@@ -18,7 +19,7 @@ build: &BUILD
- . $HOME/.cargo/env || true
- $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
- $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
- - $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- -D warnings
+ - $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- $CLIPPYFLAGS
# Tests that do require executing the binaries
test: &TEST
@@ -239,6 +240,10 @@ task:
image: rustlang/rust:nightly
env:
BUILD: check
+ # Must allow here rather than in lib.rs because this lint doesn't exist
+ # prior to Rust 1.57.0
+ # https://github.com/rust-lang/rust-clippy/issues/7718
+ CLIPPYFLAGS: -D warnings -A clippy::if_then_panic
TOOLCHAIN: nightly
ZFLAGS: -Zbuild-std
matrix: