Merge remote-tracking branch 'origin/master' into flakes

1 files changed, 14 insertions, 0 deletions

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 814028442..30654e315 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -386,6 +386,20 @@ string replaceStrings(const std::string & s,
     const std::string & from, const std::string & to);
 
 
+std::string rewriteStrings(const std::string & s, const StringMap & rewrites);
+
+
+/* If a set contains 'from', remove it and insert 'to'. */
+template<typename T>
+void replaceInSet(std::set<T> & set, const T & from, const T & to)
+{
+    auto i = set.find(from);
+    if (i == set.end()) return;
+    set.erase(i);
+    set.insert(to);
+}
+
+
 /* Convert the exit status of a child as returned by wait() into an
    error string. */
 string statusToString(int status);