Skip to content

Apache DataFusion SQL Query Engine

ci: check all features with Clippy (#26591)

Kumar Ujjawal26fe7ad4820d
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ba77e4ddb7..33af1e3b5f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -835,6 +835,9 @@ jobs:
with:
save-if: ${{ github.ref_name == 'main' }}
shared-key: "amd-ci-clippy"
+ - name: Install CMake
+ # The all-features check builds snmalloc-sys, which requires CMake.
+ run: apt-get install -y --no-install-recommends cmake
- name: Run clippy
run: ci/scripts/rust_clippy.sh
diff --git a/ci/scripts/rust_clippy.sh b/ci/scripts/rust_clippy.sh
index f8b5c0852f..29fa856d2e 100755
--- a/ci/scripts/rust_clippy.sh
+++ b/ci/scripts/rust_clippy.sh
@@ -22,7 +22,7 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SCRIPT_NAME="$(basename "${BASH_SOURCE[0]}")"
CLIPPY_FEATURES="avro,integration-tests,extended_tests"
-CLIPPY_ARGS=(--all-targets --workspace --features "$CLIPPY_FEATURES")
+CLIPPY_ARGS=(--all-targets --workspace)
CLIPPY_LINT_ARGS=(-- -D warnings)
source "${SCRIPT_DIR}/utils/git.sh"
@@ -34,7 +34,7 @@ usage() {
cat >&2 <<EOF
Usage: $SCRIPT_NAME [--write] [--allow-dirty]
-Runs \`cargo clippy\` to lint.
+Runs \`cargo clippy\` with the standard feature set and with all features.
--write Run \`cargo clippy --fix\` to apply fixes for clippy lints (requires a clean git worktree, no uncommitted changes).
--allow-dirty Allow \`--write\` to run even when the git worktree has uncommitted or staged changes.
EOF
@@ -65,12 +65,14 @@ fi
CLIPPY_CMD=(cargo clippy)
if [[ "$MODE" == "write" ]]; then
- CLIPPY_CMD+=(--fix)
- if [[ $ALLOW_DIRTY -eq 1 ]]; then
- CLIPPY_CMD+=(--allow-dirty --allow-staged)
- fi
+ CLIPPY_CMD+=(--fix --allow-dirty --allow-staged)
fi
-CLIPPY_CMD+=("${CLIPPY_ARGS[@]}" "${CLIPPY_LINT_ARGS[@]}")
-echo "[${SCRIPT_NAME}] \`${CLIPPY_CMD[*]}\`"
-"${CLIPPY_CMD[@]}"
+run_clippy() {
+ local clippy_cmd=("${CLIPPY_CMD[@]}" "${CLIPPY_ARGS[@]}" "$@" "${CLIPPY_LINT_ARGS[@]}")
+ echo "[${SCRIPT_NAME}] \`${clippy_cmd[*]}\`"
+ "${clippy_cmd[@]}"
+}
+
+run_clippy --features "$CLIPPY_FEATURES"
+run_clippy --all-features