fix(xtask): restore make lint to green on main - #50
Merged
nerdalert merged 1 commit intoAug 13, 2026
Merged
Conversation
`make lint` fails on main today with two independent issues in the same gate, both pre-existing and unrelated to any change of mine: 1. `cargo clippy -D warnings` (clippy::match_same_arms): both `IngressMode::Global` and `IngressMode::Workload` map to the same `DEFAULT_WORKLOAD_IMAGE_PULL_POLICY` value in `demo_image_pull_policy`. Merged into a single or-pattern arm, matching clippy's own suggested fix, with a doc comment explaining why the parameter is kept despite both variants currently sharing a default. Existing test coverage (`public_demo_modes_use_registry_defaults`) already asserts both variants return the same value, so no new test is needed. 2. `cargo +nightly-2026-03-28 fmt --all -- --check`: two call sites (`combined_site_demo.rs`, `image_overrides.rs`'s own test module) had drifted from the pinned nightly formatter's output. CI's own `lint` job short-circuits at the clippy step today, so this second, independent failure is currently hidden — fixing only the clippy issue would just move the same red `lint` check to a different error. Ran `cargo +nightly-2026-03-28 fmt --all` (the exact toolchain CI pins) to resolve; purely whitespace/line-wrapping, no logic changes. Signed-off-by: Jordi Gil <jgil@redhat.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context
Noticed while investigating
ai#716thatmain's ownlintCI check has been red sincead9f36c(everything else — tests, coverage, msrv, etc. — is green).What's wrong
make lintfails on two independent issues in the same gate, both pre-existing:cargo clippy -D warnings(clippy::match_same_arms) —IngressMode::GlobalandIngressMode::Workloadboth map to the sameDEFAULT_WORKLOAD_IMAGE_PULL_POLICYvalue indemo_image_pull_policy. Merged into a single or-pattern arm (clippy's own suggested fix), with a doc comment on why the parameter stays despite both variants currently sharing a default. Existing test coverage (public_demo_modes_use_registry_defaults) already asserts both variants return the same value.cargo +nightly-2026-03-28 fmt --all -- --check(same nightly this repo's CI pins) — two call sites had drifted from the formatter's output. CI'slintjob short-circuits at the clippy step today, so this second failure is currently hidden: fixing only the clippy issue would just move the same red check to a different error. Ran the pinned formatter to resolve — purely whitespace/line-wrapping, no logic changes.Test plan
cargo clippy --workspace --all-targets -- -D warnings— cleancargo +nightly-2026-03-28 fmt --all -- --check— cleancargo test -p xtask image_overrides— 6/6 passingcargo machete— clean