From aa7433982b3ab0a83bd742b5dc4d589fe816615b Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 18 Jan 2025 09:49:25 +0100
Subject: [PATCH] nix-util: Use small_vector in concatMapStringsSep

(cherry picked from commit 32898dc46a21c628d3ae275310307c56cbe8ab03)
---
 src/libutil/strings.cc | 1 +
 src/libutil/strings.hh | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc
index 402b7ae98..b94bca611 100644
--- a/src/libutil/strings.cc
+++ b/src/libutil/strings.cc
@@ -37,6 +37,7 @@ basicSplitString(std::basic_string_view<OsChar> s, std::basic_string_view<OsChar
 template std::string concatStringsSep(std::string_view, const std::list<std::string> &);
 template std::string concatStringsSep(std::string_view, const std::set<std::string> &);
 template std::string concatStringsSep(std::string_view, const std::vector<std::string> &);
+template std::string concatStringsSep(std::string_view, const boost::container::small_vector<std::string, 64> &);
 
 typedef std::string_view strings_2[2];
 template std::string concatStringsSep(std::string_view, const strings_2 &);
diff --git a/src/libutil/strings.hh b/src/libutil/strings.hh
index ae0f0070e..521e3425f 100644
--- a/src/libutil/strings.hh
+++ b/src/libutil/strings.hh
@@ -6,6 +6,8 @@
 #include <string>
 #include <vector>
 
+#include <boost/container/small_vector.hpp>
+
 namespace nix {
 
 /*
@@ -54,6 +56,7 @@ std::string concatStringsSep(const std::string_view sep, const C & ss);
 extern template std::string concatStringsSep(std::string_view, const std::list<std::string> &);
 extern template std::string concatStringsSep(std::string_view, const std::set<std::string> &);
 extern template std::string concatStringsSep(std::string_view, const std::vector<std::string> &);
+extern template std::string concatStringsSep(std::string_view, const boost::container::small_vector<std::string, 64> &);
 
 /**
  * Apply a function to the `iterable`'s items and concat them with `separator`.
@@ -61,7 +64,7 @@ extern template std::string concatStringsSep(std::string_view, const std::vector
 template<class C, class F>
 std::string concatMapStringsSep(std::string_view separator, const C & iterable, F fn)
 {
-    std::vector<std::string> strings;
+    boost::container::small_vector<std::string, 64> strings;
     strings.reserve(iterable.size());
     for (const auto & elem : iterable) {
         strings.push_back(fn(elem));