qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.strings.trimWith: Refactor scoping (#339001)

Browse Source
This commit is contained in:
Silvan Mosberger 2024-09-02 20:57:43 +02:00 committed by GitHub
commit cb6c5083a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/strings.nix
View File

@ -408,7 +408,6 @@ rec {
start ? false, start ? false,
end ? false, end ? false,
}: }:
s:
let let
# Define our own whitespace character class instead of using # Define our own whitespace character class instead of using
# `[:space:]`, which is not well-defined. # `[:space:]`, which is not well-defined.
@ -425,12 +424,14 @@ rec {
"(.*[^${chars}])[${chars}]*" "(.*[^${chars}])[${chars}]*"
else else
"(.*)"; "(.*)";
in
s:
let
# If the string was empty or entirely whitespace, # If the string was empty or entirely whitespace,
# then the regex may not match and `res` will be `null`. # then the regex may not match and `res` will be `null`.
res = match regex s; res = match regex s;
in in
optionalString (res != null) (head res); optionalString (res != null) (head res);
/** /**
Construct a Unix-style, colon-separated search path consisting of Construct a Unix-style, colon-separated search path consisting of