From a1564d8750fb8e5b605b71d35e90da1d13f0bd4d Mon Sep 17 00:00:00 2001 From: Leo Stewen Date: Fri, 24 Jul 2026 15:12:58 +0200 Subject: [PATCH 1/3] Introduce nextest for a faster and more modern Rust test runner --- flake.nix | 1 + justfile | 2 +- packages/coln-batch/justfile | 5 ++++- packages/coln-js-runtime/justfile | 7 ++++++- packages/coln-query/justfile | 5 ++++- packages/coln-store/justfile | 5 ++++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 19978bfb..860d0be0 100644 --- a/flake.nix +++ b/flake.nix @@ -217,6 +217,7 @@ cabal-install cabal2nix cargo-llvm-cov + cargo-nextest coln-manual-dev forester fourmolu diff --git a/justfile b/justfile index 75d01c1c..ad031caf 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ fix package: check-haskell: (check "coln-compiler") (check "coln-cli") (check "coln-repl") (check "coln-ls") (check "fnotation") (check "diagnostician") -check-rust: (check "coln-store") (check "coln-batch") +check-rust: (check "coln-store") (check "coln-query") (check "coln-batch") check-typescript: (check "coln-js-runtime") diff --git a/packages/coln-batch/justfile b/packages/coln-batch/justfile index a2637da9..fd790ee7 100644 --- a/packages/coln-batch/justfile +++ b/packages/coln-batch/justfile @@ -18,7 +18,10 @@ clippy: cargo clippy -p {{crate}} --all-targets --all-features -- -D warnings test: - cargo test -p {{crate}} --all-targets + cargo nextest run -p {{crate}} --all-targets + # As of now nextest does not support doc tests, so we fallback to + # cargo test to run them. + cargo test --doc -p {{crate}} import: cargo fix -p {{crate}} --all-targets --all-features --allow-dirty --allow-staged diff --git a/packages/coln-js-runtime/justfile b/packages/coln-js-runtime/justfile index 6de08c86..06952e81 100644 --- a/packages/coln-js-runtime/justfile +++ b/packages/coln-js-runtime/justfile @@ -3,11 +3,16 @@ # just # list recipes # just test # rust + npm tests +crate := "coln-js-runtime" + default: @just --list test-rust: - cargo test --all-targets + cargo nextest run -p {{crate}} --all-targets + # As of now nextest does not support doc tests, so we fallback to + # cargo test to run them. + cargo test --doc -p {{crate}} build: npm run build diff --git a/packages/coln-query/justfile b/packages/coln-query/justfile index 6d20a080..679aea88 100644 --- a/packages/coln-query/justfile +++ b/packages/coln-query/justfile @@ -30,7 +30,10 @@ import: fix: import fmt test: - cargo test -p {{crate}} --all-targets + cargo nextest run -p {{crate}} --all-targets + # As of now nextest does not support doc tests, so we fallback to + # cargo test to run them. + cargo test --doc -p {{crate}} check: fmt-check clippy test diff --git a/packages/coln-store/justfile b/packages/coln-store/justfile index 2cf5e025..c10df40a 100644 --- a/packages/coln-store/justfile +++ b/packages/coln-store/justfile @@ -30,7 +30,10 @@ import: fix: import fmt test: - cargo test -p {{crate}} --all-targets + cargo nextest run -p {{crate}} --all-targets + # As of now nextest does not support doc tests, so we fallback to + # cargo test to run them. + cargo test --doc -p {{crate}} check: fmt-check clippy test From a1bb6588f6c6551865d9df53d569dfdc30e3b427 Mon Sep 17 00:00:00 2001 From: Leo Stewen Date: Fri, 24 Jul 2026 15:44:36 +0200 Subject: [PATCH 2/3] Try fix github actions to work with nextest, too --- .github/workflows/check.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3d4b0b1e..a2d0039f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -60,8 +60,14 @@ jobs: - name: Install Rust uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install nextest + uses: taiki-e/install-action@nextest + + - name: Install just + uses: extractions/setup-just@v3 + - name: Run tests - run: cargo test + run: just check-rust coln-js-runtime-check: runs-on: ubuntu-latest @@ -74,6 +80,9 @@ jobs: with: target: wasm32-unknown-unknown + - name: Install nextest + uses: taiki-e/install-action@nextest + - name: Install wasm-bindgen-cli run: | VERSION="0.2.123" From 2672986e1d6abac73ba87d4234e64cffd910b328 Mon Sep 17 00:00:00 2001 From: Shuntian Liu Date: Tue, 28 Jul 2026 11:07:51 +0100 Subject: [PATCH 3/3] coln-flir-rs: Add justfile for coln-flir-rs --- justfile | 2 +- packages/coln-flir-rs/justfile | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 packages/coln-flir-rs/justfile diff --git a/justfile b/justfile index ad031caf..fdd31d0a 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ fix package: check-haskell: (check "coln-compiler") (check "coln-cli") (check "coln-repl") (check "coln-ls") (check "fnotation") (check "diagnostician") -check-rust: (check "coln-store") (check "coln-query") (check "coln-batch") +check-rust: (check "coln-store") (check "coln-query") (check "coln-batch") (check "coln-flir-rs") check-typescript: (check "coln-js-runtime") diff --git a/packages/coln-flir-rs/justfile b/packages/coln-flir-rs/justfile new file mode 100644 index 00000000..334cd282 --- /dev/null +++ b/packages/coln-flir-rs/justfile @@ -0,0 +1,39 @@ +# Task runner: https://github.com/casey/just +# From packages/coln-flir-rs, with Rust on PATH (e.g. `nix develop`): +# just # list available recipes +# just check # fmt-check + clippy + test +# just cargo-check # type-check coln-flir-rs targets +# just import +# just fix # apply cargo fixes + format + +crate := "coln-flir-rs" + +default: + @just --list + +fmt: + cargo fmt -p {{crate}} + +fmt-check: + cargo fmt -p {{crate}} --check + +cargo-check: + cargo check -p {{crate}} --all-targets + +clippy: + cargo clippy -p {{crate}} --all-targets --all-features -- -D warnings + +import: + cargo fix -p {{crate}} --all-targets --all-features --allow-dirty --allow-staged + +fix: import fmt + +test: + cargo nextest run -p {{crate}} --all-targets + # As of now nextest does not support doc tests, so we fallback to + # cargo test to run them. + cargo test --doc -p {{crate}} + +check: fmt-check clippy test + +ci: check