maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): always pass Bindings by ptr, use shared/unique_ptr

Browse source 
Value now carries a shared_ptr<Bindings>, and all Bindings constructors return a unique_ptr<Bindings>.

The test that wanted to compare two Bindings by putting them into Values has been modified to use the new Equal() method on Bindings (extracted from EvalState).

Change-Id: I8dfb60e65fdabb717e3b3e5d56d5b3fc82f70883
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1744
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-08-13 16:40:27 -07:00 • committed by kanepyork
parent 38f2ea34f4
commit 1fc9ba4885
22 changed files with 129 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/libexpr/get-drvs.hh vendored
View file

@ -23,7 +23,8 @@ struct DrvInfo {
bool failed = false; // set if we get an AssertionError
Bindings *attrs = nullptr, *meta = nullptr;
std::shared_ptr<Bindings> attrs = nullptr;
std::shared_ptr<Bindings> meta = nullptr;
Bindings* getMeta();
@ -33,7 +34,8 @@ struct DrvInfo {
std::string attrPath; /* path towards the derivation */
DrvInfo(EvalState& state) : state(&state){};
DrvInfo(EvalState& state, std::string attrPath, Bindings* attrs);
DrvInfo(EvalState& state, std::string attrPath,
std::shared_ptr<Bindings> attrs);
DrvInfo(EvalState& state, const ref<Store>& store,
const std::string& drvPathWithOutputs);
@ -75,7 +77,7 @@ std::optional<DrvInfo> getDerivation(EvalState& state, Value& v,
bool ignoreAssertionFailures);
void getDerivations(EvalState& state, Value& v, const std::string& pathPrefix,
Bindings& autoArgs, DrvInfos& drvs,
Bindings* autoArgs, DrvInfos& drvs,
bool ignoreAssertionFailures);
} // namespace nix