Restructure cleanCargoToml tests

tests/cleanCargoToml/default.nix

@@ -3,13 +3,15 @@
 , writeTOML
 }:
 
+path:
 let
   cleaned = cleanCargoToml {
-    cargoToml = ./Cargo.toml;
+    cargoToml = path + /Cargo.toml;
   };
   cleanedToml = writeTOML "cleaned.toml" cleaned;
+  expected = path + /expected.toml;
 in
 runCommand "compare" { } ''
-  diff ${./expected.toml} ${cleanedToml}
+  diff ${expected} ${cleanedToml}
   touch $out
 ''

tests/cleanCargoToml/simple/default.nix

@@ -1,15 +0,0 @@
-{ cleanCargoToml
-, runCommand
-, writeTOML
-}:
-
-let
-  cleaned = cleanCargoToml {
-    cargoToml = ./Cargo.toml;
-  };
-  cleanedToml = writeTOML "cleaned.toml" cleaned;
-in
-runCommand "compare" { } ''
-  diff ${./expected.toml} ${cleanedToml}
-  touch $out
-''

tests/default.nix

@@ -12,8 +12,9 @@ pkgs.lib.makeScope myLib.newScope (self:
     callPackage = self.newScope { };
   in
   {
-    cleanCargoTomlSimple = callPackage ./cleanCargoToml/simple { };
+    cmpCleanCargoToml = callPackage ./cleanCargoToml { };
-    cleanCargoTomlComplex = callPackage ./cleanCargoToml/complex { };
+    cmpCleanCargoTomlSimple = self.cmpCleanCargoToml ./cleanCargoToml/barebones;
+    cmpCleanCargoTomlComplex = self.cmpCleanCargoToml ./cleanCargoToml/complex;
 
     compilesFresh = callPackage ./compilesFresh.nix { };
     compilesFreshSimple = self.compilesFresh ./simple "simple";