From e75501da3ecf2b4081bd17a9d22f008178671fc0 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 13 Sep 2025 23:21:24 +0300 Subject: [PATCH] libexpr: Remove non-const iterators of Bindings --- src/libexpr/attr-set.cc | 3 +-- src/libexpr/include/nix/expr/attr-set.hh | 12 ------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/libexpr/attr-set.cc b/src/libexpr/attr-set.cc index 48d4c4d4a..88474c36f 100644 --- a/src/libexpr/attr-set.cc +++ b/src/libexpr/attr-set.cc @@ -35,8 +35,7 @@ Value & BindingsBuilder::alloc(std::string_view name, PosIdx pos) void Bindings::sort() { - if (size_) - std::sort(begin(), end()); + std::sort(attrs, attrs + size_); } Value & Value::mkAttrs(BindingsBuilder & bindings) diff --git a/src/libexpr/include/nix/expr/attr-set.hh b/src/libexpr/include/nix/expr/attr-set.hh index 4ab54c8eb..5bf266e54 100644 --- a/src/libexpr/include/nix/expr/attr-set.hh +++ b/src/libexpr/include/nix/expr/attr-set.hh @@ -81,8 +81,6 @@ public: return !size_; } - typedef Attr * iterator; - typedef const Attr * const_iterator; void push_back(const Attr & attr) @@ -108,16 +106,6 @@ public: return nullptr; } - iterator begin() - { - return &attrs[0]; - } - - iterator end() - { - return &attrs[size_]; - } - const_iterator begin() const { return &attrs[0];