Skip to content

Commit c7a8193

Browse files
bors[bot]asomers
andauthored
Merge #1552
1552: Suppress a warning from the latest clippy r=asomers a=asomers Co-authored-by: Alan Somers <[email protected]>
2 parents cc1528c + fb1ae12 commit c7a8193

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.cirrus.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cargo_cache:
55
env:
66
# Build by default; don't just check
77
BUILD: build
8+
CLIPPYFLAGS: -D warnings
89
RUSTFLAGS: -D warnings
910
RUSTDOCFLAGS: -D warnings
1011
TOOL: cargo
@@ -18,7 +19,7 @@ build: &BUILD
1819
- . $HOME/.cargo/env || true
1920
- $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
2021
- $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
21-
- $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- -D warnings
22+
- $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- $CLIPPYFLAGS
2223

2324
# Tests that do require executing the binaries
2425
test: &TEST
@@ -239,6 +240,10 @@ task:
239240
image: rustlang/rust:nightly
240241
env:
241242
BUILD: check
243+
# Must allow here rather than in lib.rs because this lint doesn't exist
244+
# prior to Rust 1.57.0
245+
# https://github.com/rust-lang/rust-clippy/issues/7718
246+
CLIPPYFLAGS: -D warnings -A clippy::if_then_panic
242247
TOOLCHAIN: nightly
243248
ZFLAGS: -Zbuild-std
244249
matrix:

0 commit comments

Comments
 (0)