about summary refs log tree commit diff
path: root/third_party/nix/src/nix-env/user-env.cc
diff options
context:
space:
mode:
authorKane York <kanepyork@gmail.com>2020-08-13T23·40-0700
committerkanepyork <rikingcoding@gmail.com>2020-08-17T02·23+0000
commit1fc9ba4885f5a16e263bcc5e58bef68e3aa32cea (patch)
tree8c53707e223b9516002e3bf80f0e731f8c0f3212 /third_party/nix/src/nix-env/user-env.cc
parent38f2ea34f466d8264f7a060627eece5b3cbc40ba (diff)
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>
Diffstat (limited to 'third_party/nix/src/nix-env/user-env.cc')
-rw-r--r--third_party/nix/src/nix-env/user-env.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc
index 0cb921c8249d..dac0c52a81b7 100644
--- a/third_party/nix/src/nix-env/user-env.cc
+++ b/third_party/nix/src/nix-env/user-env.cc
@@ -20,8 +20,8 @@ DrvInfos queryInstalled(EvalState& state, const Path& userEnv) {
   if (pathExists(manifestFile)) {
     Value v;
     state.evalFile(manifestFile, v);
-    Bindings& bindings(*Bindings::NewGC());
-    getDerivations(state, v, "", bindings, elems, false);
+    std::unique_ptr<Bindings> bindings(Bindings::New());
+    getDerivations(state, v, "", bindings.get(), elems, false);
   }
   return elems;
 }