Merge pull request #292938 from adisbladis/mapattrsrecursivecond-env

lib.mapAttrsRecursiveCond: Eliminate intermediate one intermediate variable environment
2024-11-25 16:33:15 +00:00 · 2024-03-06 19:40:52 +01:00 · 2024-03-06 19:40:52 +01:00 · 2dc95cded0
commit 2dc95cded0
parent b180a6af30 34fefe4e16
1 changed files with 6 additions and 7 deletions
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@ -746,14 +746,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