about summary refs log tree commit diff
path: root/tools/depotfmt.nix
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2024-07-30T19·35+0300
committerclbot <clbot@tvl.fyi>2024-07-31T20·07+0000
commit13720d90bf1ad63deefda3e9e5ca3c187267c989 (patch)
treec3e3de1bbc4268dd410a5ce3fc258e1969928310 /tools/depotfmt.nix
parent7cfac04b7ddab313a894eb57c654d7c0a9babb41 (diff)
fix(tvix): Reuse now exposed depotfmt wrapper in crate2nix-check r/8433
This change exposes the already existing wrapper for treefmt/depotfmt
that supports running it inside a sandbox. We now reuse it inside
//tvix/crate2nix-check, where we previously duplicated the code. The
check is now stricter and will also fail on changes, so I had to set the
rust edition in the treefmt config.

Change-Id: I000e52421258979c038ba6b1f1ff2db14e391b0c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12068
Tested-by: BuildkiteCI
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tools/depotfmt.nix')
-rw-r--r--tools/depotfmt.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix
index a1caab0e210e..e40001018c37 100644
--- a/tools/depotfmt.nix
+++ b/tools/depotfmt.nix
@@ -28,6 +28,7 @@ let
 
     [formatter.rust]
     command = "${pkgs.rustfmt}/bin/rustfmt"
+    options = ["--edition", "2021"]
     includes = [ "*.rs" ]
     excludes = [
       "users/tazjin/*",
@@ -53,10 +54,12 @@ let
   '';
 in
 depotfmt.overrideAttrs (_: {
-  passthru.config = config;
-  passthru.meta.ci.extraSteps.check = {
-    label = "depot formatting check";
-    command = check;
-    alwaysRun = true;
+  passthru = {
+    inherit config check;
+    meta.ci.extraSteps.check = {
+      label = "depot formatting check";
+      command = check;
+      alwaysRun = true;
+    };
   };
 })