feat(users/Profpatsch/writers): make testing default for rustSimple r/2434

This way we don’t have to explicitely wrap the rust crate with a
`testRustSimple`, but it will be done automatically, unless `doCheck`
is set to `false`.

Change-Id: I32a81821eeff620e7da57332b0873495bb85a843
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2841
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: sterni <sternenseemann@systemli.org>

3 files changed, 14 insertions, 11 deletions

diff --git a/users/Profpatsch/netencode/default.nix b/users/Profpatsch/netencode/default.nix
index 206e382c74c6..b913c3e39d79 100644
--- a/users/Profpatsch/netencode/default.nix
+++ b/users/Profpatsch/netencode/default.nix
@@ -6,8 +6,7 @@ let
       writers;
   };
 
-  netencode-rs = imports.writers.testRustSimple
-    (imports.writers.rustSimpleLib {
+  netencode-rs = imports.writers.rustSimpleLib {
       name = "netencode";
       dependencies = [
         depot.third_party.rust-crates.nom
@@ -15,7 +14,7 @@ let
       ];
       release = false;
       verbose = true;
-    } (builtins.readFile ./netencode.rs));
+    } (builtins.readFile ./netencode.rs);
 
   gen = import ./gen.nix { inherit lib; };
 
diff --git a/users/Profpatsch/writers/default.nix b/users/Profpatsch/writers/default.nix
index ee3ac7bda782..3cb105b5ed1f 100644
--- a/users/Profpatsch/writers/default.nix
+++ b/users/Profpatsch/writers/default.nix
@@ -78,8 +78,11 @@ let
   rustSimpleBin = {
     name,
     dependencies ? [],
+    doCheck ? true,
     ...
-  }@args: src: pkgs.buildRustCrate ({
+  }@args: src:
+    (if doCheck then testRustSimple else pkgs.lib.id)
+    (pkgs.buildRustCrate ({
       pname = name;
       version = "1.0.0";
       crateName = name;
@@ -93,13 +96,16 @@ let
         cp "$srcPath" $out/src/bin/${name}.rs
         find $out
       '';
-    } // args);
+    } // args));
 
   rustSimpleLib = {
     name,
     dependencies ? [],
+    doCheck ? true,
     ...
-  }@args: src: pkgs.buildRustCrate ({
+  }@args: src:
+    (if doCheck then testRustSimple else pkgs.lib.id)
+    (pkgs.buildRustCrate ({
       pname = name;
       version = "1.0.0";
       crateName = name;
@@ -112,7 +118,7 @@ let
         cp "$srcPath" $out/src/lib.rs
         find $out
       '';
-    } // args);
+    } // args));
 
   /* Takes a `buildRustCrate` derivation as an input,
     * builds it with `{ buildTests = true; }` and runs
@@ -146,6 +152,5 @@ in {
     rustSimple
     rustSimpleBin
     rustSimpleLib
-    testRustSimple
     ;
 }
diff --git a/users/Profpatsch/writers/tests/default.nix b/users/Profpatsch/writers/tests/default.nix
index a16f5fa1f972..4b28792f75a0 100644
--- a/users/Profpatsch/writers/tests/default.nix
+++ b/users/Profpatsch/writers/tests/default.nix
@@ -4,7 +4,6 @@ let
   inherit (depot.users.Profpatsch.writers)
     python3Lib
     python3
-    testRustSimple
     rustSimple
     rustSimpleLib
     rustSimpleBin
@@ -46,7 +45,7 @@ let
   '');
 
 
-  rustTransitiveLib = testRustSimple (rustSimpleLib {
+  rustTransitiveLib = rustSimpleLib {
     name = "transitive";
   } ''
     pub fn transitive(s: &str) -> String {
@@ -64,7 +63,7 @@ let
         assert_eq!(transitive("foo").as_str(), "foo 1 2 3")
       }
     }
-  '');
+  '';
 
   rustTestLib = rustSimpleLib {
     name = "test_lib";