diff options
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/primops.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index a5bac3f0b1dc..66321c76977d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -914,13 +914,11 @@ static void prim_attrNames(EvalState & state, const Pos & pos, Value * * args, V state.mkList(v, args[0]->attrs->size()); - StringSet names; - foreach (Bindings::iterator, i, *args[0]->attrs) - names.insert(i->name); - unsigned int n = 0; - foreach (StringSet::iterator, i, names) - mkString(*(v.list.elems[n++] = state.allocValue()), *i); + for (auto & i : *args[0]->attrs) + mkString(*(v.list.elems[n++] = state.allocValue()), i.name); + + std::sort(v.list.elems, v.list.elems + n, [](Value * v1, Value * v2) { return strcmp(v1->string.s, v2->string.s) < 0; }); } |