diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-13T23·40-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-17T02·23+0000 |
| commit | 1fc9ba4885f5a16e263bcc5e58bef68e3aa32cea (patch) | |
| tree | 8c53707e223b9516002e3bf80f0e731f8c0f3212 /third_party/nix/src/libexpr/common-eval-args.cc | |
| parent | 38f2ea34f466d8264f7a060627eece5b3cbc40ba (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/libexpr/common-eval-args.cc')
| -rw-r--r-- | third_party/nix/src/libexpr/common-eval-args.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libexpr/common-eval-args.cc b/third_party/nix/src/libexpr/common-eval-args.cc index b3e3782732c8..e36457f4f8ff 100644 --- a/third_party/nix/src/libexpr/common-eval-args.cc +++ b/third_party/nix/src/libexpr/common-eval-args.cc @@ -32,8 +32,8 @@ MixEvalArgs::MixEvalArgs() { .handler([&](const std::string& s) { searchPath.push_back(s); }); } -Bindings* MixEvalArgs::getAutoArgs(EvalState& state) { - Bindings* res = Bindings::NewGC(autoArgs.size()); +std::unique_ptr<Bindings> MixEvalArgs::getAutoArgs(EvalState& state) { + auto res = Bindings::New(autoArgs.size()); for (auto& i : autoArgs) { Value* v = state.allocValue(); if (i.second[0] == 'E') { |