From e9bb7aa4392d9f18adb198234b0e2d145009c6b5 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 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libutil/regex-combinators.hh b/src/libutil/regex-combinators.hh
index 8a7b2c2c01e..a80a5b0a51e 100644
--- a/src/libutil/regex-combinators.hh
+++ b/src/libutil/regex-combinators.hh
@@ -3,6 +3,7 @@
 
 #include <string_view>
 #include <string>
+#include <format>
 
 namespace nix::regex {
 
@@ -11,22 +12,17 @@ namespace nix::regex {
 
 static inline std::string either(std::string_view a, std::string_view b)
 {
-    return std::string { a } + "|" + b;
+    return std::format("{}|{}", a, b);
 }
 
 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 + ")*";
+    return std::format("({})", a);
 }
 
 static inline std::string list(std::string_view a)
 {
-    return std::string { a } + many(group("," + a));
+    return std::format("{}(,{})*", a, a);
 }
 
 }