meters: clippy-clean in every Linux configuration, and a CI gate for it #650

Merged

dcharlot merged 6 commits from meters/clippy-clean into main 2026-11-06 02:39:54 -05:00

Conversation 0 Commits 6 Files changed 11 +87 -31

dcharlot commented 2026-11-05 10:22:53 -05:00

Owner

Copy link

The meter crates carried clippy errors in their Linux configurations. No CI job linted those configurations, so the errors went unseen and kept tripping this week's meter work. This PR fixes them without changing behaviour, and adds a gate so they can't come back.

Fixes

Crate	Fix
jouleclaw-energy (rapl)	probe_packages now calls liveness::probe directly (identical: probe is probe_stepping with a no-op), so probe is no longer dead. The test-only probe_packages_stepping is #[cfg(test)].
jouleclaw-energy, jcp-energy, eoc-meter and sandbox-meter NVML hardware tests	type_complexity errors: the nvidia-smi triple is now a type SmiPower alias in each oracle.
jcp-energy	Two unused muts off macOS (the vectors are filled only on macOS): split into a macOS body and an empty non-macOS body. has_backend is rewritten as the equivalent matches!.
Joule Code L3 example	rsplit(['/', ' ']). A constant assert!(!cfg!(..)) (from #624) becomes if cfg!(..) { panic!(..) }. A per-item allow(dead_code), with a reason, on a helper one test binary doesn't use, as its sibling already has.

CI

• standards-build.yml: a meter_lint matrix key and a step, "clippy on the Linux meter code". It runs --all-targets --no-deps -D warnings on each workspace's own runner, for:
  • jcp-energy (default, nvml)
  • eoc-meter (default, cuda)
  • sandbox-meter
  • jouleclaw-energy (default, rapl, nvml, rapl,nvml)
• joule-code-conformance.yml: the L3 example is now linted after its tests.

Verified

• Linux: before this change, these configurations had 1–6 errors each. All are clean now.
• Linux tests:
  • jouleclaw-energy: 89 with rapl, 96 with rapl,nvml
  • jcp-energy: 68, and 70 with nvml
  • eoc-meter with cuda: 77
  • sandbox-meter: 166
  • L3 example: 16
  • nvml_hardware tests pass
• macOS: every macOS clippy line in CI for these crates is clean, and the macOS tests pass.
• Workflow checks: standards-touched.py parses the new key, both workflows parse as YAML, and check-workflow-concurrency.sh passes.

🤖 Generated with Claude Code

The meter crates carried clippy errors in their Linux configurations. No CI job linted those configurations, so the errors went unseen and kept tripping this week's meter work. This PR fixes them without changing behaviour, and adds a gate so they can't come back. ## Fixes | Crate | Fix | |---|---| | `jouleclaw-energy` (`rapl`) | `probe_packages` now calls `liveness::probe` directly (identical: `probe` is `probe_stepping` with a no-op), so `probe` is no longer dead. The test-only `probe_packages_stepping` is `#[cfg(test)]`. | | `jouleclaw-energy`, `jcp-energy`, `eoc-meter` and `sandbox-meter` NVML hardware tests | `type_complexity` errors: the nvidia-smi triple is now a `type SmiPower` alias in each oracle. | | `jcp-energy` | Two unused `mut`s off macOS (the vectors are filled only on macOS): split into a macOS body and an empty non-macOS body. `has_backend` is rewritten as the equivalent `matches!`. | | Joule Code L3 example | `rsplit(['/', ' '])`. A constant `assert!(!cfg!(..))` (from #624) becomes `if cfg!(..) { panic!(..) }`. A per-item `allow(dead_code)`, with a reason, on a helper one test binary doesn't use, as its sibling already has. | ## CI - **`standards-build.yml`:** a `meter_lint` matrix key and a step, "clippy on the Linux meter code". It runs `--all-targets --no-deps -D warnings` on each workspace's own runner, for: - `jcp-energy` (default, `nvml`) - `eoc-meter` (default, `cuda`) - `sandbox-meter` - `jouleclaw-energy` (default, `rapl`, `nvml`, `rapl,nvml`) - **`joule-code-conformance.yml`:** the L3 example is now linted after its tests. ## Verified - **Linux:** before this change, these configurations had 1–6 errors each. All are clean now. - **Linux tests:** - `jouleclaw-energy`: 89 with `rapl`, 96 with `rapl,nvml` - `jcp-energy`: 68, and 70 with `nvml` - `eoc-meter` with `cuda`: 77 - `sandbox-meter`: 166 - L3 example: 16 - `nvml_hardware` tests pass - **macOS:** every macOS clippy line in CI for these crates is clean, and the macOS tests pass. - **Workflow checks:** `standards-touched.py` parses the new key, both workflows parse as YAML, and `check-workflow-concurrency.sh` passes. 🤖 Generated with [Claude Code](https://claude.com/claude-code)

dcharlot added 6 commits 2026-11-05 10:22:54 -05:00

jouleclaw-energy: clippy-clean under rapl and nvml on Linux ... 1f9df46079

- `--features rapl` alone: `liveness::probe` was never used. The RAPL probe
  reached the same code through `probe_packages_stepping(packages, || {})`,
  though rapl.rs documents its probe as `crate::liveness::probe`.
  `probe_packages` now calls `crate::liveness::probe` directly, which is the
  same call (probe = probe_stepping with a no-op step), and
  `probe_packages_stepping`, which only tests use, is `#[cfg(test)]`.
- `--features nvml`: tests/nvml_hardware.rs spelled an `nvidia-smi` power
  triple out three times (type_complexity). It is now the oracle's
  `SmiPower` alias.

Clippy -D warnings is clean on Linux (default, rapl, nvml, rapl+nvml) and
macOS (default, ioreport, smc, ioreport+smc, rapl). Tests pass: Linux rapl
(89) and rapl+nvml (96), macOS rapl lib (95).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

jcp-energy: clippy-clean on Linux, with and without nvml ... fba729ce7b

- `FabricMeter::readable` and `FabricMeter::measure` built their vector
  `mut` on every platform and pushed to it only on macOS, so Linux reported
  two unused `mut`s. Each now has a macOS body that builds and returns the
  vector, and a body for everywhere else that returns it empty. The behaviour
  is the same on both.
- `FabricSource::has_backend`: with `nvml` on, its match folded to a
  `matches!` (match_like_matches_macro). It is written as one, with the nvml
  arm still gated on the feature.
- tests/nvml_hardware.rs: the `nvidia-smi` power triple is the oracle's
  `SmiPower` alias (type_complexity under `--features nvml`).

Clippy -D warnings is clean on Linux (default, nvml) and in the macOS lint
step (jcp-energy, jcp-gateway). Tests pass: Linux default (68) and nvml (70),
macOS lib (128).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

eoc-meter: the NVML hardware test's nvidia-smi triple is a type alias ... e8ac0fdfec

tests/nvml_hardware.rs spelled `(Option<f64>, Option<f64>, Option<f64>)`
out three times, which clippy flags as type_complexity under `--features
cuda`. It is now the oracle's `SmiPower` alias. Clippy -D warnings is clean on
Linux (default, cuda) and in the macOS lint step; Linux tests with cuda pass
(77).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

sandbox-meter: the NVML hardware test's nvidia-smi triple is a type alias ... c0bab66496

tests/nvml_hardware.rs spelled `(Option<f64>, Option<f64>, Option<f64>)`
out three times, which clippy flags as type_complexity on Linux. It is now
the oracle's `SmiPower` alias. Clippy -D warnings is clean on Linux and in the
macOS lint step (sandbox-meter, sandbox-proof); Linux tests pass (166).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

Joule Code L3 example: clippy-clean ... 124b019b33

- src/llama_backend.rs: `rsplit(|c: char| c == '/' || c == ' ')` is now
  `rsplit(['/', ' '])` (manual_char_comparison); it splits the same way.
- src/bin/run.rs: the host test's catch-all arm asserted
  `!cfg!(macOS on aarch64)`, a constant assertion (assertions_on_constants).
  It is now an `if cfg!(...)` that panics with the same message.
- tests/common/mod.rs: each test binary compiles the shared module on its own,
  and the seeded test calls no `resolve_priced_at`. It gets the per-item
  `#[allow(dead_code)]` its sibling `resolve_seeded` already has, with the
  reason. `#[expect]` cannot work here: it would be unfulfilled in the
  binaries that do call it.

`cargo clippy --all-targets --no-deps -- -D warnings` is clean on Linux and
macOS, and the tests pass (16). The path dependencies' own rustc warnings
(jouleclaw-backend-apple, jouleclaw-topology, jouleclaw-backend-reference on
Linux) are not this crate's and are not denied by `--no-deps`.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

ci: lint the meter crates' Linux configurations, and the L3 example ... 48412b8df4

The macOS lint step lints jcp-energy, eoc-meter, sandbox-meter and
jouleclaw-energy only as macOS builds them. The matrix's clippy gate is opt-in
per workspace, and none of these workspaces has it. So their Linux code (RAPL
through powercap and the MSRs, NVML, CUDA) was linted by no job.
jouleclaw-energy's `rapl` build carried a dead function, and four crates' NVML
hardware tests a clippy error, for as long as they existed.

- standards-build.yml: a matrix key `meter_lint` lists configurations
  (`package` or `package:features`), and a step "clippy on the Linux meter
  code" lints each one with `--all-targets --no-deps -D warnings` on the
  workspace's own runner, beside the feature-gated energy tests. The entries:
  - jcp-rs: jcp-energy, jcp-energy:nvml
  - eoc-rs: eoc-meter, eoc-meter:cuda
  - sandbox-rs: sandbox-meter
  - jouleclaw-rs: jouleclaw-energy, and with rapl, nvml and rapl,nvml
  scripts/standards-touched.py reads the new key like the others.
- joule-code-conformance.yml: "L3 JouleClaw binding example lints clean"
  (`--no-deps`), after its tests.

The step's loop was run verbatim on Linux x86_64 for each entry: all clean.
Both workflows parse, and the workflow-concurrency check passes.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

dcharlot merged commit b6587ef416 into main 2026-11-06 02:39:54 -05:00

dcharlot referenced this pull request from a commit 2026-11-06 02:39:55 -05:00

Merge pull request 'meters: clippy-clean in every Linux configuration, and a CI gate for it' (#650) from meters/clippy-clean into main

dcharlot referenced this pull request from a commit 2026-11-06 07:16:47 -05:00

ci: energy-hardware fetches the run's own commit by its hash

dcharlot referenced this pull request 2026-11-06 07:17:00 -05:00

ci: energy-hardware fetches the run's own commit by its hash #669

dcharlot referenced this pull request from a commit 2026-11-09 19:19:12 -05:00

ci: energy-hardware fetches the run's own commit by its hash

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

Transaction-Science/open-standards!650

No description provided.