From 1fc9ba4885f5a16e263bcc5e58bef68e3aa32cea Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 13 Aug 2020 16:40:27 -0700 Subject: refactor(tvix): always pass Bindings by ptr, use shared/unique_ptr Value now carries a shared_ptr, and all Bindings constructors return a unique_ptr. 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 Reviewed-by: tazjin --- third_party/nix/src/libexpr/get-drvs.hh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libexpr/get-drvs.hh') diff --git a/third_party/nix/src/libexpr/get-drvs.hh b/third_party/nix/src/libexpr/get-drvs.hh index 608713ed1b6b..b17efe8b3355 100644 --- a/third_party/nix/src/libexpr/get-drvs.hh +++ b/third_party/nix/src/libexpr/get-drvs.hh @@ -23,7 +23,8 @@ struct DrvInfo { bool failed = false; // set if we get an AssertionError - Bindings *attrs = nullptr, *meta = nullptr; + std::shared_ptr attrs = nullptr; + std::shared_ptr 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 attrs); DrvInfo(EvalState& state, const ref& store, const std::string& drvPathWithOutputs); @@ -75,7 +77,7 @@ std::optional 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 -- cgit 1.4.1