about summary refs log tree commit diff
path: root/third_party/nix/src/libexpr/attr-set.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-22T23·52+0100
committerVincent Ambo <tazjin@google.com>2020-05-22T23·52+0100
commit6b447f4b259e929faf0add0cf0ad36309a7ec13d (patch)
tree23df784b690954c5277182832158800fed792668 /third_party/nix/src/libexpr/attr-set.cc
parent8c28be1b69a66f16fd1c711931b5a6f6948a8a2a (diff)
chore(3p/nix/libexpr): Expose separate insert & "upsert" methods r/818
Reading more through the old code, it seems like the intention
/sometimes/ is to replace values.
Diffstat (limited to 'third_party/nix/src/libexpr/attr-set.cc')
-rw-r--r--third_party/nix/src/libexpr/attr-set.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/nix/src/libexpr/attr-set.cc b/third_party/nix/src/libexpr/attr-set.cc
index 55b1d0ccd540..0e4cf5d9dc5f 100644
--- a/third_party/nix/src/libexpr/attr-set.cc
+++ b/third_party/nix/src/libexpr/attr-set.cc
@@ -21,7 +21,7 @@ namespace nix {
 // This behaviour is mimicked by using .insert(), which will *not*
 // override existing values.
 void Bindings::push_back(const Attr& attr) {
-  auto [_, inserted] = attributes_.insert_or_assign(attr.name, attr);
+  auto [_, inserted] = attributes_.insert({attr.name, attr});
 
   if (!inserted) {
     DLOG(WARNING) << "attempted to insert duplicate attribute for key '"
@@ -29,6 +29,11 @@ void Bindings::push_back(const Attr& attr) {
   }
 }
 
+// Insert or assign (i.e. replace) a value in the attribute set.
+void Bindings::insert_or_assign(const Attr& attr) {
+  attributes_.insert_or_assign(attr.name, attr);
+}
+
 size_t Bindings::size() { return attributes_.size(); }
 
 size_t Bindings::capacity() { return 0; }