From e4d74ec45fb62a68c8bab9d6e1556204bb619d90 Mon Sep 17 00:00:00 2001 From: tamnd <1218621+tamnd@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:08:21 +0700 Subject: [PATCH] Run the subset check in cargo xtask all --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 4 ++++ xtask/src/main.rs | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f26986f..604b369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,7 +119,7 @@ jobs: target/debug/rulean frobnicate || code=$? test "$code" = 64 - # The repository rules of the spec: the dependency rule (03.3) and the no-C policy (13.3). `cargo xtask all` also scans the vendored source of each dependency. A later pull request adds the Aeneas subset (10.6). + # The repository rules of the spec: the dependency rule (03.3), the no-C policy (13.3) and the Aeneas subset (10.6). `cargo xtask all` also scans the vendored source of each dependency. policy: name: policy runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 1228d37..5c48c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All changes that a user can see are in this file. The format follows Keep a Chan ## [Unreleased] +### Fixed + +- `cargo xtask all` runs the subset check too. Before this change, the `policy` CI job did not check the Aeneas subset. + ## [0.0.2] - 2026-11-21 ### Added diff --git a/xtask/src/main.rs b/xtask/src/main.rs index d6de43d..08ab828 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -14,14 +14,16 @@ commands: deps check the dependency rule of spec 03.3 nonc check the no-C policy of spec 13.3 (add --vendor to scan the vendored sources) subset check that the core crates stay in the Aeneas subset of spec 10.6 - all run every check, with --vendor"; + all run every check, with --vendor for nonc"; /// Runs every check and joins the problems, so that one run shows all of them. fn all() -> Result<(), Vec> { let mut problems = Vec::new(); - for check in [deps::run as fn() -> Result<(), Vec>, || { - nonc::run(true) - }] { + for check in [ + deps::run as fn() -> Result<(), Vec>, + || nonc::run(true), + subset::run, + ] { if let Err(p) = check() { problems.extend(p); }