wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00
Code Activity

Remove EvalState::mkAttrs()

Browse source
This commit is contained in:
Eelco Dolstra 2022-01-04 20:29:17 +01:00
parent 17daec0b83
commit 2b4c944823
6 changed files with 52 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/attr-set.cc
View file

@ -7,6 +7,7 @@
namespace nix {
/* Allocate a new array of attributes for an attribute set with a specific
capacity. The space is implicitly reserved after the Bindings
structure. */
@ -16,15 +17,9 @@ Bindings * EvalState::allocBindings(size_t capacity)
return &emptyBindings;
if (capacity > std::numeric_limits<Bindings::size_t>::max())
throw Error("attribute set of size %d is too big", capacity);
return new (allocBytes(sizeof(Bindings) + sizeof(Attr) * capacity)) Bindings((Bindings::size_t) capacity);
}
void EvalState::mkAttrs(Value & v, size_t capacity)
{
v.mkAttrs(allocBindings(capacity));
nrAttrsets++;
nrAttrsInAttrsets += capacity;
return new (allocBytes(sizeof(Bindings) + sizeof(Attr) * capacity)) Bindings((Bindings::size_t) capacity);
}
@ -67,9 +62,7 @@ void Bindings::sort()
Value & Value::mkAttrs(BindingsBuilder & bindings)
{
clearValue();
internalType = tAttrs;
attrs = bindings.finish();
mkAttrs(bindings.finish());
return *this;
}