movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib.replaceChars: warn about being a deprecated alias

Browse source 
replaceStrings has been in nix since 2015(nix 1.10)

so it is safe to remove the fallback

d6d5885c15
This commit is contained in:
Artturin 2022-12-12 03:36:03 +02:00
parent 084fd69045
commit 05a2dfd674
47 changed files with 64 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/strings.nix
View file

@ -328,7 +328,7 @@ rec {
escape ["(" ")"] "(foo)"
=> "\\(foo\\)"
*/
escape = list: replaceChars list (map (c: "\\${c}") list);
escape = list: replaceStrings list (map (c: "\\${c}") list);
/* Escape occurence of the element of `list` in `string` by
converting to its ASCII value and prefixing it with \\x.
@ -341,7 +341,7 @@ rec {
=> "foo\\x20bar"
*/
escapeC = list: replaceChars list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
/* Quote string to be used safely within the Bourne shell.
@ -471,19 +471,8 @@ rec {
["\"" "'" "<" ">" "&"]
["&quot;" "&apos;" "&lt;" "&gt;" "&amp;"];
# Obsolete - use replaceStrings instead.
replaceChars = builtins.replaceStrings or (
del: new: s:
let
substList = lib.zipLists del new;
subst = c:
let found = lib.findFirst (sub: sub.fst == c) null substList; in
if found == null then
c
else
found.snd;
in
stringAsChars subst s);
# warning added 12-12-2022
replaceChars = lib.warn "replaceChars is a deprecated alias of replaceStrings, replace usages of it with replaceStrings." builtins.replaceStrings;
# Case conversion utilities.
lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
@ -497,7 +486,7 @@ rec {
toLower "HOME"
=> "home"
*/
toLower = replaceChars upperChars lowerChars;
toLower = replaceStrings upperChars lowerChars;
/* Converts an ASCII string to upper-case.
@ -507,7 +496,7 @@ rec {
toUpper "home"
=> "HOME"
*/
toUpper = replaceChars lowerChars upperChars;
toUpper = replaceStrings lowerChars upperChars;
/* Appends string context from another string. This is an implementation
detail of Nix and should be used carefully.