Modernise CI (#9)

Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com>
Reviewed-on: #9

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/rust.yml

@@ -71,7 +71,7 @@ jobs:
     #      ]
     #    }
 
-  alejandra:
+  format:
     {
       "name": "Nix formatting",
       "runs-on": "ubuntu-latest",
@@ -86,8 +86,8 @@ jobs:
           "with": { "extra_nix_config": "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" }
         },
         {
-          "name": "Run Alejandra",
+          "name": "Run nixpkgs-fmt",
-          "run": "nix develop .#ci --command alejandra -- --check ."
+          "run": "nix develop .#ci --command nixpkgs-fmt -- --check ."
         }
       ]
     }

.gitignore

@@ -4,3 +4,5 @@ target/
 .vscode/
 .profile*
 .DS_Store
+.direnv/
+result

.woodpecker/all-checks-complete.yaml

@@ -1,10 +1,10 @@
-pipeline:
+steps:
-  nix:
+  echo:
     image: alpine
     commands:
       - echo "All required checks complete"
 
 depends_on:
-  - run
   - build
-  - ci-specific
+
+skip_clone: true

.woodpecker/build.yaml

@@ -0,0 +1,22 @@
+steps:
+  build:
+    image: nixos/nix
+    commands:
+      - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf
+      # Run through Nix
+      - nix build
+      - nix run
+      - nix flake check
+      # Lint
+      - nix develop --command cargo -- fmt --all -- --check
+      - nix develop --command cargo -- clippy -- -D warnings -W clippy::must_use_candidate
+      - nix develop .#ci --command nixpkgs-fmt --check .
+      - nix develop .#ci --command markdown-link-check README.md
+      # Test
+      - nix develop --command cargo test --verbose --release
+      - nix develop --command cargo test --verbose
+
+    when:
+      - event: "push"
+        evaluate: 'CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
+      - event: "pull_request"

.woodpecker/build.yml

@@ -1,11 +0,0 @@
-pipeline:
-  build:
-    image: nixos/nix
-    commands:
-      - nix develop --command cargo test --verbose --release
-      - nix develop --command cargo test --verbose
-  lint:
-    image: nixos/nix
-    commands:
-      - nix develop --command cargo -- fmt --all -- --check
-      - nix develop --command cargo -- clippy -- -D warnings -W clippy::must_use_candidate

.woodpecker/ci-specific.yml

@@ -1,7 +0,0 @@
-pipeline:
-  alejandra:
-    image: nixos/nix
-    commands:
-      - nix develop .#ci --command alejandra -- --check .
-      - nix develop .#ci --command markdown-link-check README.md
-

.woodpecker/run.yml

@@ -1,6 +0,0 @@
-pipeline:
-  nix:
-    image: nixos/nix
-    commands:
-      - nix build
-      - nix run

Cargo.lock

@@ -1,18 +1,18 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitvec"
@@ -28,15 +28,15 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "csv"
-version = "1.2.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -46,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "csv-core"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
 dependencies = [
  "memchr",
 ]
@@ -61,9 +61,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
@@ -83,15 +83,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
 [[package]]
 name = "little_learner"
@@ -115,24 +115,24 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "ordered-float"
-version = "3.6.0"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
 ]
@@ -155,29 +155,32 @@ checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
@@ -220,15 +223,29 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
 
 [[package]]
 name = "syn"
@@ -241,6 +258,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -249,15 +277,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wyz"
@@ -267,3 +295,23 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 dependencies = [
  "tap",
 ]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]

Cargo.toml

@@ -3,3 +3,11 @@ members = [
     "little_learner",
     "little_learner_app"
 ]
+resolver = "3"
+
+[workspace.package]
+version = "0.1.0"
+edition = "2024"
+
+[workspace.metadata.crane]
+name = "little_learner"

README.md

@@ -1,5 +1,6 @@
 # The Little Learner, in Rust
 
 [![Rust](https://github.com/Smaug123/little_learner/actions/workflows/rust.yml/badge.svg)](https://github.com/Smaug123/little_learner/actions/workflows/rust.yml)
+[![CI](https://woodpecker.patrickstevens.co.uk/api/badges/patrick/little_learner/status.svg)](https://woodpecker.patrickstevens.co.uk/api/badges/patrick/little_learner/status.svg)
 
 Me running through [The Little Learner](https://www.thelittlelearner.com/), but in Rust instead of Scheme.

flake.lock

@@ -1,44 +1,30 @@
 {
   "nodes": {
-    "crate2nix": {
+    "crane": {
-      "flake": false,
       "locked": {
-        "lastModified": 1678820090,
+        "lastModified": 1757183466,
-        "narHash": "sha256-4FFeonajXNqiSP0PqUlC1wmTyPC8SX6SthEvgRjMupw=",
+        "narHash": "sha256-kTdCCMuRE+/HNHES5JYsbRHmgtr+l9mOtf5dpcMppVc=",
-        "owner": "kolloch",
+        "owner": "ipetkov",
-        "repo": "crate2nix",
+        "repo": "crane",
-        "rev": "4fd826e37bec90dfe26ca16cb6e632c617cc7c0d",
+        "rev": "d599ae4847e7f87603e7082d73ca673aa93c916d",
         "type": "github"
       },
       "original": {
-        "owner": "kolloch",
+        "owner": "ipetkov",
-        "repo": "crate2nix",
+        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1659877975,
+        "lastModified": 1731533236,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -49,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679705136,
+        "lastModified": 1757068644,
-        "narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=",
+        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd",
+        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
         "type": "github"
       },
       "original": {
@@ -63,42 +49,26 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1679734080,
-        "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dbf5322e93bcc6cfc52268367a8ad21c09d76fea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "crate2nix": "crate2nix",
+        "crane": "crane",
-        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
+        "rust-overlay": "rust-overlay"
-        "utils": "utils"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "nixpkgs": [
-        "nixpkgs": "nixpkgs_2"
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1679106165,
+        "lastModified": 1757298987,
-        "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=",
+        "narHash": "sha256-yuFSw6fpfjPtVMmym51ozHYpJQ7SzVOTkk7tUv2JA0U=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565",
+        "rev": "cfd63776bde44438ff2936f0c9194c79dd407a5f",
         "type": "github"
       },
       "original": {
@@ -107,18 +77,18 @@
         "type": "github"
       }
     },
-    "utils": {
+    "systems": {
       "locked": {
-        "lastModified": 1678901627,
+        "lastModified": 1681028828,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "numtide",
+        "owner": "nix-systems",
-        "repo": "flake-utils",
+        "repo": "default",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "nix-systems",
-        "repo": "flake-utils",
+        "repo": "default",
         "type": "github"
       }
     }

flake.nix

@@ -3,109 +3,111 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
-    rust-overlay.url = "github:oxalica/rust-overlay";
+    rust-overlay = {
-    crate2nix = {
+      url = "github:oxalica/rust-overlay";
-      url = "github:kolloch/crate2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
-      flake = false;
     };
-    flake-compat = {
+    crane = {
-      url = "github:edolstra/flake-compat";
+      url = "github:ipetkov/crane";
-      flake = false;
     };
   };
 
-  outputs = {
+  outputs = { self, nixpkgs, flake-utils, rust-overlay, crane }:
-    self,
+    flake-utils.lib.eachDefaultSystem (system:
-    nixpkgs,
+      let
-    utils,
-    rust-overlay,
-    crate2nix,
-    ...
-  }: let
-    name = "little_learner_app";
-  in
-    utils.lib.eachDefaultSystem
-    (
-      system: let
-        # Imports
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [
+          overlays = [ (import rust-overlay) ];
-            rust-overlay.overlays.default
+        };
-            (self: super: {
+
-              # Because rust-overlay bundles multiple rust packages into one
+        rustToolchain = pkgs.rust-bin.nightly.latest.default;
-              # derivation, specify that mega-bundle here, so that crate2nix
+
-              # will use them automatically.
+        craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
-              rustc = self.rust-bin.nightly.latest.default;
+
-              cargo = self.rust-bin.nightly.latest.default;
+        # Common build inputs for all derivations
-            })
+        commonArgs = {
+          src = pkgs.lib.cleanSourceWith {
+            src = ./.;
+            name = "source";
+            filter = path: type: (builtins.match ".*csv$" path != null || craneLib.filterCargoSources path type);
+          };
+          strictDeps = true;
+
+          buildInputs = with pkgs; [
+            openssl
+          ];
+
+          nativeBuildInputs = with pkgs; [
+            pkg-config
           ];
         };
-        inherit
-          (import "${crate2nix}/tools.nix" {inherit pkgs;})
-          generatedCargoNix
-          ;
 
-        # Create the cargo2nix project
+        # Build just the cargo dependencies
-        project =
+        cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-          pkgs.callPackage
+
-          (generatedCargoNix {
+        # Build the actual package
-            inherit name;
+        little_learner_app = craneLib.buildPackage (commonArgs // {
-            src = ./.;
+          inherit cargoArtifacts;
-          })
+        });
-          {
+      in
-            # Individual crate overrides go here
+      {
-            # Example: https://github.com/balsoft/simple-osd-daemons/blob/6f85144934c0c1382c7a4d3a2bbb80106776e270/flake.nix#L28-L50
+        packages = {
-            defaultCrateOverrides =
+          default = little_learner_app;
-              pkgs.defaultCrateOverrides
+          little_learner_app = little_learner_app;
-              // {
+        };
-                # The app crate itself is overriden here. Typically we
+
-                # configure non-Rust dependencies (see below) here.
+        apps.default = flake-utils.lib.mkApp {
-                ${name} = oldAttrs:
+          drv = little_learner_app;
-                  {
+          exePath = "/bin/little_learner_app";
-                    inherit buildInputs nativeBuildInputs;
+        };
-                  }
+
-                  // buildEnvVars;
+        devShells = {
-              };
+          default = craneLib.devShell {
+            # Inherit the build inputs from commonArgs
+            buildInputs = commonArgs.buildInputs;
+            nativeBuildInputs = commonArgs.nativeBuildInputs;
+
+            # Additional dev tools
+            packages = [
+              rustToolchain
+              pkgs.rust-analyzer
+            ];
+
+            RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
           };
 
-        # Configuration for the non-Rust dependencies
+          ci = pkgs.mkShell {
-        buildInputs = with pkgs; [openssl.dev];
+            buildInputs = commonArgs.buildInputs ++ [
-        nativeBuildInputs = with pkgs; [rustc cargo pkgconfig];
+              pkgs.nodePackages.markdown-link-check
-        buildEnvVars = {
+              pkgs.nixpkgs-fmt
-          PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
+              rustToolchain
-        };
+            ];
-      in rec {
-        packages.${name} = project.workspaceMembers.${name}.build;
 
-        # `nix build`
+            nativeBuildInputs = commonArgs.nativeBuildInputs;
-        defaultPackage = packages.${name};
 
-        # `nix run`
+            RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
-        apps.${name} = utils.lib.mkApp {
+          };
-          inherit name;
-          drv = packages.${name};
         };
-        defaultApp = apps.${name};
 
-        # `nix develop`
+        checks = {
-        devShells = {
+          inherit little_learner_app;
-          ci =
+
-            pkgs.mkShell {
+          # Run cargo fmt check
-              inherit nativeBuildInputs;
+          fmt = craneLib.cargoFmt {
-              buildInputs = [pkgs.nodePackages.markdown-link-check pkgs.alejandra] ++ buildInputs;
+            inherit (commonArgs) src;
-              RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+          };
-            }
+
-            // buildEnvVars;
+          # Run clippy
-          default =
+          clippy = craneLib.cargoClippy (commonArgs // {
-            pkgs.mkShell
+            inherit cargoArtifacts;
-            {
+            cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-              inherit buildInputs nativeBuildInputs;
+          });
-              RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+
-            }
+          # Run tests
-            // buildEnvVars;
+          tests = craneLib.cargoTest (commonArgs // {
+            inherit cargoArtifacts;
+          });
         };
-      }
+      });
-    );
 }

little_learner/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "little_learner"
-version = "0.1.0"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

little_learner/src/auto_diff.rs

@@ -727,10 +727,10 @@ impl<A, Tag, const RANK: usize> RankedDifferentiableTagged<A, Tag, RANK> {
         }
     }
 
-    pub fn map2_tagged<'a, 'b, B, C, Tag2, Tag3, F>(
+    pub fn map2_tagged<'a, B, C, Tag2, Tag3, F>(
         self: &'a RankedDifferentiableTagged<A, Tag, RANK>,
         other: &'a RankedDifferentiableTagged<B, Tag2, RANK>,
-        f: &'b mut F,
+        f: &mut F,
     ) -> RankedDifferentiableTagged<C, Tag3, RANK>
     where
         F: FnMut(&Scalar<A>, Tag, &Scalar<B>, Tag2) -> (Scalar<C>, Tag3),
@@ -843,8 +843,7 @@ where
     F: FnMut(
         &[DifferentiableTagged<A, Tag>; PARAM_RANK],
     ) -> RankedDifferentiableTagged<A, Tag, RANK>,
-    A: ?Sized
+    A: Clone
-        + Clone
         + Hash
         + AddAssign
         + Add<Output = A>

little_learner/src/block.rs

@@ -32,6 +32,7 @@ where
 }
 
 #[must_use]
+#[expect(clippy::type_complexity)]
 pub fn dense<'b, A, Tag>(
     input_len: usize,
     neuron_count: usize,

little_learner/src/decider.rs

@@ -7,11 +7,7 @@ pub(crate) fn rectify<A>(x: A) -> A
 where
     A: Zero + PartialOrd,
 {
-    if x < A::zero() {
+    if x < A::zero() { A::zero() } else { x }
-        A::zero()
-    } else {
-        x
-    }
 }
 
 fn linear<A, Tag1, Tag2>(

little_learner/src/gradient_descent.rs

@@ -1,4 +1,4 @@
-use crate::auto_diff::{grad, Differentiable, RankedDifferentiable};
+use crate::auto_diff::{Differentiable, RankedDifferentiable, grad};
 use crate::hyper;
 use crate::loss::l2_loss_2;
 use crate::predictor::Predictor;
@@ -139,8 +139,8 @@ mod tests {
     use crate::scalar::Scalar;
     use crate::traits::Zero;
     use ordered_float::NotNan;
-    use rand::rngs::StdRng;
     use rand::SeedableRng;
+    use rand::rngs::StdRng;
 
     #[test]
     fn test_iterate() {

little_learner/src/lib.rs

@@ -1,6 +1,5 @@
 #![allow(incomplete_features)]
 #![feature(generic_const_exprs)]
-#![feature(array_methods)]
 #![feature(closure_lifetime_binder)]
 
 pub mod auto_diff;

little_learner/src/scalar.rs

@@ -2,7 +2,7 @@ use crate::traits::{Exp, One, Sqrt, Zero};
 use core::hash::Hash;
 use std::cmp::Ordering;
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     fmt::Display,
     iter::Sum,
     ops::{Add, AddAssign, Div, Mul, Neg, Sub},
@@ -356,7 +356,7 @@ where
 
 #[cfg(test)]
 mod test_loss {
-    use crate::auto_diff::{grad, Differentiable, RankedDifferentiable};
+    use crate::auto_diff::{Differentiable, RankedDifferentiable, grad};
     use crate::scalar::Scalar;
     use crate::traits::Sqrt;
     use ordered_float::NotNan;

little_learner_app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "little_learner_app"
-version = "0.1.0"
+version.workspace = true
-edition = "2021"
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

little_learner_app/src/iris.rs

@@ -92,7 +92,7 @@ impl<A> Iris<A> {
 
 #[cfg(test)]
 mod test {
-    use crate::iris::{import, Iris, IrisType};
+    use crate::iris::{Iris, IrisType, import};
 
     const EXPECTED_FIRST: Iris<f32> = Iris {
         class: IrisType::Setosa,