From 6848154b2e657e64a592b60f00b68db8d911b89f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 16 Dec 2024 12:47:20 +0000
Subject: [PATCH] regex-combinators: fix linter error when adding string_view
 and string

---
 src/libutil/regex-combinators.hh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libutil/regex-combinators.hh b/src/libutil/regex-combinators.hh
index 8a7b2c2c01e..75ccd4e6cf0 100644
--- a/src/libutil/regex-combinators.hh
+++ b/src/libutil/regex-combinators.hh
@@ -3,6 +3,7 @@
 
 #include <string_view>
 #include <string>
+#include <sstream>
 
 namespace nix::regex {
 
@@ -11,22 +12,23 @@ namespace nix::regex {
 
 static inline std::string either(std::string_view a, std::string_view b)
 {
-    return std::string { a } + "|" + b;
+    std::stringstream ss;
+    ss << a << "|" << b;
+    return ss.str();
 }
 
 static inline std::string group(std::string_view a)
 {
-    return std::string { "(" } + a + ")";
-}
-
-static inline std::string many(std::string_view a)
-{
-    return std::string { "(?:" } + a + ")*";
+    std::stringstream ss;
+    ss << "(" << a << ")";
+    return ss.str();
 }
 
 static inline std::string list(std::string_view a)
 {
-    return std::string { a } + many(group("," + a));
+    std::stringstream ss;
+    ss << a << "(," << a << ")*";
+    return ss.str();
 }
 
 }