@@ -43,19 +43,25 @@ jobs:
4343 run : cargo fmt -- --check
4444 - name : Run clippy
4545 run : |
46- # Keep clippy strict for most crates, but avoid churn from toolchain-specific lints
47- # in upstream Zebra code that started firing after the Rust 1.85 toolchain bump.
48- cargo clippy \
49- --workspace --no-deps --all-features --all-targets --locked \
50- --exclude zebra-chain \
51- -- -D warnings
52-
53- cargo clippy \
54- -p zebra-chain --no-deps --all-features --all-targets --locked \
55- -- -D warnings \
56- -A elided_named_lifetimes \
57- -A clippy::needless_lifetimes \
58- -A clippy::unnecessary_lazy_evaluations
46+ # After upgrading from Rust 1.82 to 1.85.1, Clippy started failing on new lints in upstream
47+ # code we don’t want to patch here (and may already be fixed upstream). To avoid carrying
48+ # fixes and merge conflicts, we allow these lints only for the affected crates for now.
49+ # TODO: remove this comment and these Clippy exceptions after syncing with updated upstream.
50+ cargo clippy --workspace --no-deps --all-features --all-targets --locked \
51+ --exclude zebra-chain --exclude zebra-state -- -D warnings
52+
53+ # relaxed only for zebra-chain (your previous three)
54+ cargo clippy -p zebra-chain --all-features --all-targets --locked -- \
55+ -D warnings \
56+ -A elided_named_lifetimes \
57+ -A clippy::needless_lifetimes \
58+ -A clippy::unnecessary_lazy_evaluations
59+
60+ # relaxed only for zebra-state (new)
61+ cargo clippy -p zebra-state --all-features --all-targets --locked -- \
62+ -D warnings \
63+ -A clippy::useless_conversion
64+
5965 - name : Show system resource summary
6066 run : |
6167 df -h
0 commit comments