From 608a425550b3c90de39d4a668a504debcc8c53de Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 13 Jul 2024 00:13:58 +0200
Subject: [PATCH] dropEmptyInitThenConcatStringsSep -> concatStringSep: diag

---
 src/libstore/misc.cc                             | 2 +-
 src/libstore/unix/build/local-derivation-goal.cc | 6 ++++--
 src/nix/diff-closures.cc                         | 2 +-
 src/nix/profile.cc                               | 4 +++-
 src/nix/search.cc                                | 4 +++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index fbfa15f51..bcc02206b 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -465,7 +465,7 @@ OutputPathMap resolveDerivedPath(Store & store, const DerivedPath::Built & bfd)
     if (!outputsLeft.empty())
         throw Error("derivation '%s' does not have an outputs %s",
             store.printStorePath(drvPath),
-            dropEmptyInitThenConcatStringsSep(", ", quoteStrings(std::get<OutputsSpec::Names>(bfd.outputs.raw))));
+            concatStringsSep(", ", quoteStrings(std::get<OutputsSpec::Names>(bfd.outputs.raw))));
     return outputMap;
 }
 
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index 2ab4334e9..523fe07e7 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -64,6 +64,8 @@
 #include <grp.h>
 #include <iostream>
 
+#include "strings.hh"
+
 namespace nix {
 
 void handleDiffHook(
@@ -840,7 +842,7 @@ void LocalDerivationGoal::startBuilder()
 
     /* Run the builder. */
     printMsg(lvlChatty, "executing builder '%1%'", drv->builder);
-    printMsg(lvlChatty, "using builder args '%1%'", dropEmptyInitThenConcatStringsSep(" ", drv->args));
+    printMsg(lvlChatty, "using builder args '%1%'", concatStringsSep(" ", drv->args));
     for (auto & i : drv->env)
         printMsg(lvlVomit, "setting builder env variable '%1%'='%2%'", i.first, i.second);
 
@@ -1063,7 +1065,7 @@ void LocalDerivationGoal::startBuilder()
                 e.addTrace({}, "while waiting for the build environment for '%s' to initialize (%s, previous messages: %s)",
                     worker.store.printStorePath(drvPath),
                     statusToString(status),
-                    dropEmptyInitThenConcatStringsSep("|", msgs));
+                    concatStringsSep("|", msgs));
                 throw;
             }
         }();
diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc
index 204213396..9e5a7e4c3 100644
--- a/src/nix/diff-closures.cc
+++ b/src/nix/diff-closures.cc
@@ -97,7 +97,7 @@ void printClosureDiff(
                 items.push_back(fmt("%s → %s", showVersions(removed), showVersions(added)));
             if (showDelta)
                 items.push_back(fmt("%s%+.1f KiB" ANSI_NORMAL, sizeDelta > 0 ? ANSI_RED : ANSI_GREEN, sizeDelta / 1024.0));
-            logger->cout("%s%s: %s", indent, name, dropEmptyInitThenConcatStringsSep(", ", items));
+            logger->cout("%s%s: %s", indent, name, concatStringsSep(", ", items));
         }
     }
 }
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index c21eb3040..548a793d8 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -17,6 +17,8 @@
 #include <regex>
 #include <iomanip>
 
+#include "strings.hh"
+
 using namespace nix;
 
 struct ProfileElementSource
@@ -472,7 +474,7 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
                 originalConflictingFilePath,
                 newConflictingFilePath,
                 originalEntryName,
-                dropEmptyInitThenConcatStringsSep(" ", newConflictingRefs),
+                concatStringsSep(" ", newConflictingRefs),
                 conflictError.priority,
                 conflictError.priority - 1,
                 conflictError.priority + 1
diff --git a/src/nix/search.cc b/src/nix/search.cc
index d709774ad..7c46f9fec 100644
--- a/src/nix/search.cc
+++ b/src/nix/search.cc
@@ -15,6 +15,8 @@
 #include <fstream>
 #include <nlohmann/json.hpp>
 
+#include "strings.hh"
+
 using namespace nix;
 using json = nlohmann::json;
 
@@ -96,7 +98,7 @@ struct CmdSearch : InstallableValueCommand, MixJSON
             auto attrPathS = state->symbols.resolve(attrPath);
 
             Activity act(*logger, lvlInfo, actUnknown,
-                fmt("evaluating '%s'", dropEmptyInitThenConcatStringsSep(".", attrPathS)));
+                fmt("evaluating '%s'", concatStringsSep(".", attrPathS)));
             try {
                 auto recurse = [&]()
                 {