diff options
author | Vincent Ambo <tazjin@tvl.su> | 2024-03-15T13·42+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-03-15T14·22+0000 |
commit | d3534ee051abad5117e9578854b6cd13a14d940d (patch) | |
tree | 258286ebf2c9390ef748a73f086ef6b4f80b4663 /tvix/eval/src/tests/tvix_tests/lib.nix | |
parent | d5b6704d3d82c1c1acf45aba71ab1a337f94defd (diff) |
fix(depotfmt): only exclude *imported* tvix tests r/7699
When we added the Nix language test suite in cl/6126, we excluded the whole tvix tests folder from Nix formatting. This is unintentional, as we probably want *our* tests to be formatted correctly. Change-Id: I2b66d79e30fae17e75d5a1f8c44e279886091c5f Reviewed-on: https://cl.tvl.fyi/c/depot/+/11154 Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/tests/tvix_tests/lib.nix')
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/lib.nix | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/tvix/eval/src/tests/tvix_tests/lib.nix b/tvix/eval/src/tests/tvix_tests/lib.nix index 028a538314b7..ab509bc85fa5 100644 --- a/tvix/eval/src/tests/tvix_tests/lib.nix +++ b/tvix/eval/src/tests/tvix_tests/lib.nix @@ -3,7 +3,7 @@ with builtins; rec { fold = op: nul: list: - if list == [] + if list == [ ] then nul else op (head list) (fold op nul (tail list)); @@ -14,23 +14,25 @@ rec { flatten = x: if isList x - then fold (x: y: (flatten x) ++ y) [] x - else [x]; + then fold (x: y: (flatten x) ++ y) [ ] x + else [ x ]; sum = foldl' (x: y: add x y) 0; hasSuffix = ext: fileName: - let lenFileName = stringLength fileName; - lenExt = stringLength ext; - in !(lessThan lenFileName lenExt) && - substring (sub lenFileName lenExt) lenFileName fileName == ext; + let + lenFileName = stringLength fileName; + lenExt = stringLength ext; + in + !(lessThan lenFileName lenExt) && + substring (sub lenFileName lenExt) lenFileName fileName == ext; # Split a list at the given position. splitAt = pos: list: - if pos == 0 then {first = []; second = list;} else - if list == [] then {first = []; second = [];} else + if pos == 0 then { first = [ ]; second = list; } else + if list == [ ] then { first = [ ]; second = [ ]; } else let res = splitAt (sub pos 1) (tail list); - in {first = [(head list)] ++ res.first; second = res.second;}; + in { first = [ (head list) ] ++ res.first; second = res.second; }; # Stable merge sort. sortBy = comp: list: @@ -40,14 +42,15 @@ rec { split = splitAt (div (length list) 2) list; first = sortBy comp split.first; second = sortBy comp split.second; - in mergeLists comp first second + in + mergeLists comp first second else list; mergeLists = comp: list1: list2: - if list1 == [] then list2 else - if list2 == [] then list1 else - if comp (head list2) (head list1) then [(head list2)] ++ mergeLists comp list1 (tail list2) else - [(head list1)] ++ mergeLists comp (tail list1) list2; + if list1 == [ ] then list2 else + if list2 == [ ] then list1 else + if comp (head list2) (head list1) then [ (head list2) ] ++ mergeLists comp list1 (tail list2) else + [ (head list1) ] ++ mergeLists comp (tail list1) list2; id = x: x; @@ -55,7 +58,7 @@ rec { range = first: last: if first > last - then [] - else genList (n: first + n) (last - first + 1); + then [ ] + else genList (n: first + n) (last - first + 1); } |