From 29a5cbe7460c6b2d209365a8b286a4abe6549766 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 25 Oct 2023 17:36:49 +1300
Subject: [PATCH] util: deduplicate stripStr implementation

---
 lib/pep508.nix |  5 +----
 lib/pip.nix    |  9 +--------
 lib/util.nix   | 10 +++++++++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/pep508.nix b/lib/pep508.nix
index 04b0447..40f75a1 100644
--- a/lib/pep508.nix
+++ b/lib/pep508.nix
@@ -3,7 +3,7 @@
 let
   inherit (builtins) match elemAt split foldl' substring stringLength typeOf fromJSON isString head mapAttrs elem length;
   inherit (lib) stringToCharacters fix;
-  inherit (import ./util.nix { inherit lib; }) splitComma;
+  inherit (import ./util.nix { inherit lib; }) splitComma stripStr;
 
   re = {
     operators = "([=><!~^]+)";
@@ -34,9 +34,6 @@ let
     }
   );
 
-  # Strip leading/trailing whitespace from string
-  stripStr = s: let t = match "[\t ]*(.*[^\t ])[\t ]*" s; in if t == null then "" else head t;
-
   # Remove groupings ( ) from expression
   unparen = expr':
     let
diff --git a/lib/pip.nix b/lib/pip.nix
index 8f958ca..bc78dfc 100644
--- a/lib/pip.nix
+++ b/lib/pip.nix
@@ -4,14 +4,7 @@
 }:
 let
   inherit (builtins) match head tail typeOf split filter foldl' readFile dirOf hasContext unsafeDiscardStringContext;
-
-  stripStr = s:
-    let
-      t = match "[\t ]*(.*[^\t ])[\t ]*" s;
-    in
-    if t == null
-    then ""
-    else head t;
+  inherit (import ./util.nix { inherit lib; }) stripStr;
 
   uncomment = l: head (match " *([^#]*).*" l);
 
diff --git a/lib/util.nix b/lib/util.nix
index 143d923..2160d2f 100644
--- a/lib/util.nix
+++ b/lib/util.nix
@@ -1,11 +1,19 @@
 # Small utilities for internal reuse, not exposed externally
 { lib }:
 let
-  inherit (builtins) filter match split;
+  inherit (builtins) filter match split head;
   inherit (lib) isString;
 
   isEmptyStr = s: isString s && match " *" s == null;
 in
 {
   splitComma = s: if s == "" then [ ] else filter isEmptyStr (split " *, *" s);
+
+  stripStr = s:
+    let
+      t = match "[\t ]*(.*[^\t ])[\t ]*" s;
+    in
+    if t == null
+    then ""
+    else head t;
 }