lib.mapAttrsRecursiveCond: Eliminate intermediate one intermediate variable environment

2024-11-22 06:53:01 +00:00 · 2024-03-03 16:15:31 +13:00 · 2024-03-03 16:15:31 +13:00 · 34fefe4e16
commit 34fefe4e16
parent 31f91738fb
1 changed files with 6 additions and 7 deletions
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@ -731,14 +731,13 @@ rec {
    set:
    let
      recurse = path:
-        let
-          g =
-            name: value:
+        mapAttrs
+          (name: value:
            if isAttrs value && cond value
-              then recurse (path ++ [name]) value
-              else f (path ++ [name]) value;
-        in mapAttrs g;
-    in recurse [] set;
+            then recurse (path ++ [ name ]) value
+            else f (path ++ [ name ]) value);
+    in
+    recurse [ ] set;


  /* Generate an attribute set by mapping a function over a list of