about summary refs log tree commit diff
path: root/third_party/nix/src/libexpr/attr-set.hh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-22T00·52+0100
committerVincent Ambo <tazjin@google.com>2020-05-22T00·52+0100
commitee4637e3a22a1efc480bb66ea025afd107d1b158 (patch)
tree1cf734ff3f038adf66505698ade086ef1142e6e6 /third_party/nix/src/libexpr/attr-set.hh
parent28e347effe1ba4325fc485e920bda45c838e0450 (diff)
refactor(3p/nix/libexpr): Use absl::btree_map::merge for '//' r/800
Instead of doing some sort of inline merge-sort of the two attribute
sets, use the attribute sets merge function.

This commit alone does not build and is not supposed to.
Diffstat (limited to 'third_party/nix/src/libexpr/attr-set.hh')
-rw-r--r--third_party/nix/src/libexpr/attr-set.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/nix/src/libexpr/attr-set.hh b/third_party/nix/src/libexpr/attr-set.hh
index 551cddaae4eb..39af7c482eab 100644
--- a/third_party/nix/src/libexpr/attr-set.hh
+++ b/third_party/nix/src/libexpr/attr-set.hh
@@ -50,6 +50,9 @@ class Bindings {
   iterator begin();
   iterator end();
 
+  // Merge values from other into the current attribute
+  void merge(Bindings* other);
+
   // ???
   [[deprecated]] void sort();