1 files changed, 61 insertions, 76 deletions
diff --git a/third_party/nix/src/libexpr/attr-set.hh b/third_party/nix/src/libexpr/attr-set.hh
index 3119a1848a..f56261ad6a 100644
--- a/third_party/nix/src/libexpr/attr-set.hh
+++ b/third_party/nix/src/libexpr/attr-set.hh
@@ -1,95 +1,80 @@
 #pragma once
 
+#include <algorithm>
 #include "nixexpr.hh"
 #include "symbol-table.hh"
 
-#include <algorithm>
-
 namespace nix {
 
-
 class EvalState;
 struct Value;
 
 /* Map one attribute name to its value. */
-struct Attr
-{
-    Symbol name;
-    Value * value;
-    Pos * pos;
-    Attr(Symbol name, Value * value, Pos * pos = &noPos)
-        : name(name), value(value), pos(pos) { };
-    Attr() : pos(&noPos) { };
-    bool operator < (const Attr & a) const
-    {
-        return name < a.name;
-    }
+struct Attr {
+  Symbol name;
+  Value* value;
+  Pos* pos;
+  Attr(Symbol name, Value* value, Pos* pos = &noPos)
+      : name(name), value(value), pos(pos){};
+  Attr() : pos(&noPos){};
+  bool operator<(const Attr& a) const { return name < a.name; }
 };
 
 /* Bindings contains all the attributes of an attribute set. It is defined
    by its size and its capacity, the capacity being the number of Attr
    elements allocated after this structure, while the size corresponds to
    the number of elements already inserted in this structure. */
-class Bindings
-{
-public:
-    typedef uint32_t size_t;
-
-private:
-    size_t size_, capacity_;
-    Attr attrs[0];
-
-    Bindings(size_t capacity) : size_(0), capacity_(capacity) { }
-    Bindings(const Bindings & bindings) = delete;
-
-public:
-    size_t size() const { return size_; }
-
-    bool empty() const { return !size_; }
-
-    typedef Attr * iterator;
-
-    void push_back(const Attr & attr)
-    {
-        assert(size_ < capacity_);
-        attrs[size_++] = attr;
-    }
-
-    iterator find(const Symbol & name)
-    {
-        Attr key(name, 0);
-        iterator i = std::lower_bound(begin(), end(), key);
-        if (i != end() && i->name == name) return i;
-        return end();
-    }
-
-    iterator begin() { return &attrs[0]; }
-    iterator end() { return &attrs[size_]; }
-
-    Attr & operator[](size_t pos)
-    {
-        return attrs[pos];
-    }
-
-    void sort();
-
-    size_t capacity() { return capacity_; }
-
-    /* Returns the attributes in lexicographically sorted order. */
-    std::vector<const Attr *> lexicographicOrder() const
-    {
-        std::vector<const Attr *> res;
-        res.reserve(size_);
-        for (size_t n = 0; n < size_; n++)
-            res.emplace_back(&attrs[n]);
-        std::sort(res.begin(), res.end(), [](const Attr * a, const Attr * b) {
-            return (const string &) a->name < (const string &) b->name;
-        });
-        return res;
-    }
-
-    friend class EvalState;
-};
+class Bindings {
+ public:
+  typedef uint32_t size_t;
+
+ private:
+  size_t size_, capacity_;
+  Attr attrs[0];
+
+  Bindings(size_t capacity) : size_(0), capacity_(capacity) {}
+  Bindings(const Bindings& bindings) = delete;
+
+ public:
+  size_t size() const { return size_; }
+
+  bool empty() const { return !size_; }
 
+  typedef Attr* iterator;
+
+  void push_back(const Attr& attr) {
+    assert(size_ < capacity_);
+    attrs[size_++] = attr;
+  }
+
+  iterator find(const Symbol& name) {
+    Attr key(name, 0);
+    iterator i = std::lower_bound(begin(), end(), key);
+    if (i != end() && i->name == name) return i;
+    return end();
+  }
+
+  iterator begin() { return &attrs[0]; }
+  iterator end() { return &attrs[size_]; }
+
+  Attr& operator[](size_t pos) { return attrs[pos]; }
+
+  void sort();
+
+  size_t capacity() { return capacity_; }
+
+  /* Returns the attributes in lexicographically sorted order. */
+  std::vector<const Attr*> lexicographicOrder() const {
+    std::vector<const Attr*> res;
+    res.reserve(size_);
+    for (size_t n = 0; n < size_; n++) res.emplace_back(&attrs[n]);
+    std::sort(res.begin(), res.end(), [](const Attr* a, const Attr* b) {
+      return (const string&)a->name < (const string&)b->name;
+    });
+    return res;
+  }
+
+  friend class EvalState;
+};
 
-}
+}  // namespace nix