Issue 8152 - Reduce number of attribute set created by replaceChars.

2015-07-13 23:46:38 +02:00 · 2015-07-13 23:46:38 +02:00 · be65ac7c32
commit be65ac7c32
parent 74f4b0d27a
1 changed files with 6 additions and 4 deletions
--- a/lib/strings.nix
+++ b/lib/strings.nix
@ -107,11 +107,13 @@ rec {
  # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
  replaceChars = del: new: s:
    let
+      substList = lib.zipLists del new;
      subst = c:
-        (lib.fold
-          (sub: res: if sub.fst == c then sub else res)
-          {fst = c; snd = c;} (lib.zipLists del new)
-        ).snd;
+        let found = lib.findFirst (sub: sub.fst == c) null substList; in
+        if found == null then
+          c
+        else
+          found.snd;
    in
      stringAsChars subst s;