From 7e07b3ecd55ac85675c26d9b09fab9996c410681 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Nov 2023 01:41:01 +1300 Subject: [PATCH] lib.attrsets.hasAttrByPath: Don't allocate one extra list per lookup recursion Using `tail` in a recursive loop like this needlessly allocates. This changes the loop to look up by list index instead. --- lib/attrsets.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index bf6c90bf1be6..107570627c66 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -58,13 +58,17 @@ rec { attrPath: # The nested attribute set to check e: - let attr = head attrPath; + let + lenAttrPath = length attrPath; + hasAttrByPath' = n: s: let + attr = elemAt attrPath n; + in ( + if n == lenAttrPath then true + else if s ? ${attr} then hasAttrByPath' (n + 1) s.${attr} + else false + ); in - if attrPath == [] then true - else if e ? ${attr} - then hasAttrByPath (tail attrPath) e.${attr} - else false; - + hasAttrByPath' 0 e; /* Create a new attribute set with `value` set at the nested attribute location specified in `attrPath`.