lib.attrsets.matchAttrs: only assert isAttrs once

2026-06-20 16:53:32 -04:00
parent 0cadcfb613
commit bc4b353bff
1 changed files with 20 additions and 15 deletions
@@ -1800,22 +1800,27 @@ rec {
    :::
  */
  matchAttrs =
-    pattern: attrs:
+    let
+      recurse =
+        pattern: attrs:
+        all (
+          # Compare equality between `pattern` & `attrs`.
+          attr:
+          # Missing attr, not equal.
+          attrs ? ${attr}
+          && (
+            let
+              lhs = pattern.${attr};
+              rhs = attrs.${attr};
+            in
+            # If attrset check recursively
+            if isAttrs lhs then isAttrs rhs && recurse lhs rhs else lhs == rhs
+          )
+        ) (attrNames pattern);
+    in
+    pattern:
    assert isAttrs pattern;
-    all (
-      # Compare equality between `pattern` & `attrs`.
-      attr:
-      # Missing attr, not equal.
-      attrs ? ${attr}
-      && (
-        let
-          lhs = pattern.${attr};
-          rhs = attrs.${attr};
-        in
-        # If attrset check recursively
-        if isAttrs lhs then isAttrs rhs && matchAttrs lhs rhs else lhs == rhs
-      )
-    ) (attrNames pattern);
+    recurse pattern;

  /**
    Override only the attributes that are already present in the old set