Merge pull request #27 from payjoin/more-fmt

more treefmt formatters & cargo sort

Author: nothingmuch

.github/workflows/cargo.yml

@@ -1,10 +1,8 @@
 name: Cargo
-
 on:
   push:
     branches: [main]
   pull_request:
-
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/ci.yml

@@ -1,10 +1,8 @@
 name: CI
-
 on:
   push:
     branches: [main]
   pull_request:
-
 jobs:
   scrub:
     runs-on: ubuntu-latest

Justfile

@@ -13,7 +13,7 @@ check-all:
 # Lint checks (formatting + source invariants)
 lint:
     {{ nix_cmd }} build --no-update-lock-file '.#checks.{{ system }}.lint'
- 
+
 # Auto-format all files
 fmt:
     nix fmt

nix/checks.nix

@@ -89,6 +89,17 @@
           }
         );
 
+        cargo-sort =
+          pkgs.runCommand "cargo-sort-${rev}"
+            {
+              inherit src;
+              nativeBuildInputs = [ pkgs.cargo-sort ];
+            }
+            ''
+              cargo-sort --check --workspace "$src"
+              mkdir -p $out
+            '';
+
         no-todo-comments = pkgs.runCommand "no-todo-comments-${rev}" { inherit src; } ''
           if grep -rn --exclude-dir=contrib 'TO[D]O\|FIX[M]E' $src/ 2>/dev/null; then
             echo "FAIL: unresolved work-item markers found"
@@ -110,6 +121,7 @@
         lint = pkgs.symlinkJoin {
           name = "lint-checks-${rev}";
           paths = [
+            checks.cargo-sort
             checks.clippy
             checks.doc
             checks.no-todo-comments

nix/treefmt.nix

@@ -10,6 +10,10 @@
       programs.rustfmt.enable = true;
       programs.shellcheck.enable = true;
       programs.shfmt.enable = true;
+      programs.just.enable = true;
+      programs.mdformat.enable = true;
+      programs.taplo.enable = true;
+      programs.yamlfmt.enable = true;
 
       settings.global.excludes = [ ".envrc" ];
     };