Skip to content

Commit e4c74ab

Browse files
committed
Fail format CI if clippy issues a warning
1 parent 8b41741 commit e4c74ab

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,26 @@ file(GLOB_RECURSE ALL_CXX_SOURCES
9494

9595
set(PYTHON_SOURCES ${PROJECT_SOURCE_DIR}/tests/lit/lit/formats/Cpp2RustTest.py)
9696

97+
# `clippy --fix` downgrades -Dwarnings errors back to warnings, and manifest
98+
# lints (e.g., unused dependencies) ignore it. Make cargo deny all warnings.
99+
set(CLIPPY_ENV CARGO_BUILD_WARNINGS=deny)
100+
97101
add_custom_target("format"
98102
COMMAND ${CLANG_FORMAT} -i ${ALL_CXX_SOURCES}
99103
COMMAND cargo +${RUST_STABLE_VERSION} fmt --manifest-path ${PROJECT_SOURCE_DIR}/rules/Cargo.toml
100104
COMMAND cargo +${RUST_NIGHTLY_VERSION} fmt --manifest-path ${PROJECT_SOURCE_DIR}/rule-preprocessor/Cargo.toml
101105
COMMAND cargo +${RUST_STABLE_VERSION} fmt --manifest-path ${PROJECT_SOURCE_DIR}/libcc2rs/Cargo.toml
102106
COMMAND cargo +${RUST_STABLE_VERSION} fmt --manifest-path ${PROJECT_SOURCE_DIR}/libcc2rs-macros/Cargo.toml
103-
COMMAND ${CARGO_ENV_RULES}
107+
COMMAND ${CARGO_ENV_RULES} ${CLIPPY_ENV}
104108
cargo +${RUST_STABLE_VERSION} clippy --release --fix --allow-dirty --allow-no-vcs --allow-staged --all-targets --all-features
105109
--manifest-path ${PROJECT_SOURCE_DIR}/rules/Cargo.toml -- -Dwarnings
106-
COMMAND ${CARGO_ENV_RULE_PREPROCESSOR}
110+
COMMAND ${CARGO_ENV_RULE_PREPROCESSOR} ${CLIPPY_ENV}
107111
cargo +${RUST_NIGHTLY_VERSION} clippy --release --fix --allow-dirty --allow-no-vcs --allow-staged --all-targets --all-features
108112
--manifest-path ${PROJECT_SOURCE_DIR}/rule-preprocessor/Cargo.toml -- -Dwarnings
109-
COMMAND ${CARGO_ENV_LIBCC2RS}
113+
COMMAND ${CARGO_ENV_LIBCC2RS} ${CLIPPY_ENV}
110114
cargo +${RUST_STABLE_VERSION} clippy --release --fix --allow-dirty --allow-no-vcs --allow-staged --all-targets --all-features
111115
--manifest-path ${PROJECT_SOURCE_DIR}/libcc2rs/Cargo.toml -- -Dwarnings
112-
COMMAND ${CARGO_ENV_LIBCC2RS_MACROS}
116+
COMMAND ${CARGO_ENV_LIBCC2RS_MACROS} ${CLIPPY_ENV}
113117
cargo +${RUST_STABLE_VERSION} clippy --release --fix --allow-dirty --allow-no-vcs --allow-staged --all-targets --all-features
114118
--manifest-path ${PROJECT_SOURCE_DIR}/libcc2rs-macros/Cargo.toml -- -Dwarnings
115119
COMMAND ${RUFF} --silent check --fix ${PYTHON_SOURCES}

0 commit comments

Comments
 (0)