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

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>

1 files changed, 2 insertions, 2 deletions

diff --git a/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc b/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc
index 5454c6cd108e..66e7cff810f5 100644
--- a/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -107,7 +107,7 @@ static int _main(int argc, char** argv) {
     auto store = openStore();
     auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
 
-    Bindings& autoArgs = *myArgs.getAutoArgs(*state);
+    std::unique_ptr<Bindings> autoArgs = myArgs.getAutoArgs(*state);
 
     /* If -A is given, get the URI from the specified Nix
        expression. */
@@ -122,7 +122,7 @@ static int _main(int argc, char** argv) {
           resolveExprPath(lookupFileArg(*state, args.empty() ? "." : args[0]));
       Value vRoot;
       state->evalFile(path, vRoot);
-      Value& v(*findAlongAttrPath(*state, attrPath, autoArgs, vRoot));
+      Value& v(*findAlongAttrPath(*state, attrPath, autoArgs.get(), vRoot));
       state->forceAttrs(v);
 
       /* Extract the URI. */