From 5db71cfb3b9d109f77bd6f5235a11d44215d0b54 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <raito@lix.systems>
Date: Mon, 9 Jun 2025 18:32:54 +0200
Subject: [PATCH] libutil: `add` should emplace inside a `ChunkedVector`

This simplifies many call-sites where construction can take place
automatically.

Change-Id: I87f697d55375676345b388024eb8df900bf808de
Co-authored-by: Tom Hubrecht <github@mail.hubrecht.ovh>
Signed-off-by: Raito Bezarius <raito@lix.systems>
---
 lix/libexpr/symbol-table.hh   | 2 +-
 lix/libutil/chunked-vector.hh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lix/libexpr/symbol-table.hh b/lix/libexpr/symbol-table.hh
index 0b99fdadd..b50a52f50 100644
--- a/lix/libexpr/symbol-table.hh
+++ b/lix/libexpr/symbol-table.hh
@@ -90,7 +90,7 @@ public:
         auto it = symbols.find(s);
         if (it != symbols.end()) return Symbol(it->second.second + 1);
 
-        const auto & [rawSym, idx] = store.add(std::string(s));
+        const auto & [rawSym, idx] = store.add(s);
         symbols.emplace(rawSym, std::make_pair(&rawSym, idx));
         return Symbol(idx + 1);
     }
diff --git a/lix/libutil/chunked-vector.hh b/lix/libutil/chunked-vector.hh
index d914e2542..a14793768 100644
--- a/lix/libutil/chunked-vector.hh
+++ b/lix/libutil/chunked-vector.hh
@@ -45,7 +45,8 @@ public:
 
     uint32_t size() const { return size_; }
 
-    std::pair<T &, uint32_t> add(T value)
+    template<typename... Args>
+    std::pair<T &, uint32_t> add(Args &&... args)
     {
         const auto idx = size_++;
         auto & chunk = [&] () -> auto & {
@@ -53,7 +54,7 @@ public:
                 return back;
             return addChunk();
         }();
-        auto & result = chunk.emplace_back(std::move(value));
+        auto & result = chunk.emplace_back(std::forward<Args>(args)...);
         return {result, idx};
     }