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-22T00·54+0100
committerVincent Ambo <tazjin@google.com>2020-05-22T00·59+0100
commit42205f27fc820ddc64616d55c04e2ffde1948043 (patch)
tree06cbc1332eec9fb083f7a31bf0dcd092d1e23139 /third_party/nix/src/libexpr/attr-set.cc
parentee4637e3a22a1efc480bb66ea025afd107d1b158 (diff)
refactor(3p/nix/libexpr): Use absl::btree_map::iterator type r/801
Instead of using a custom Args* iterator, use the one belonging to the
map type directly.
Diffstat (limited to 'third_party/nix/src/libexpr/attr-set.cc')
-rw-r--r--third_party/nix/src/libexpr/attr-set.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/third_party/nix/src/libexpr/attr-set.cc b/third_party/nix/src/libexpr/attr-set.cc
index e0fac9234b14..2df6bc9a2155 100644
--- a/third_party/nix/src/libexpr/attr-set.cc
+++ b/third_party/nix/src/libexpr/attr-set.cc
@@ -31,12 +31,17 @@ std::vector<const Attr*> Bindings::lexicographicOrder() {
 }
 
 Bindings::iterator Bindings::find(const Symbol& name) {
-  return &attributes_[name];
+  return attributes_.find(name);
 }
 
-Bindings::iterator Bindings::begin() { return &(attributes_.begin()->second); }
+Bindings::iterator Bindings::begin() {
+  return attributes_.begin();
+}
+
+Bindings::iterator Bindings::end() {
+  return attributes_.end();
+}
 
-Bindings::iterator Bindings::end() { return &(attributes_.end()->second); }
 void Bindings::merge(Bindings* other) {
   // We want the values from the other attribute set to take
   // precedence, but .merge() works the other way around.