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/tests/attr-set.cc | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'third_party/nix/src/tests') diff --git a/third_party/nix/src/tests/attr-set.cc b/third_party/nix/src/tests/attr-set.cc index d52956f6ac02..84756c60940e 100644 --- a/third_party/nix/src/tests/attr-set.cc +++ b/third_party/nix/src/tests/attr-set.cc @@ -121,14 +121,8 @@ class AttrSetTest : public ::testing::Test { symbol_table = &eval_state_->symbols; } - void assert_bindings_equal(nix::Bindings& lhs, nix::Bindings& rhs) { - Value lhs_val; - Value rhs_val; - lhs_val.type = rhs_val.type = ValueType::tAttrs; - lhs_val.attrs = &lhs; - rhs_val.attrs = &lhs; - - RC_ASSERT(eval_state_->eqValues(lhs_val, rhs_val)); + void assert_bindings_equal(nix::Bindings* lhs, nix::Bindings* rhs) { + RC_ASSERT(lhs->Equal(rhs, *eval_state_)); } }; @@ -136,24 +130,26 @@ class AttrSetMonoidTest : public AttrSetTest {}; RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeLeftIdentity, (nix::Bindings && bindings)) { - auto empty_bindings = nix::Bindings::NewGC(); - auto result = *Bindings::Merge(*empty_bindings, bindings); - assert_bindings_equal(result, bindings); + auto empty_bindings = nix::Bindings::New(); + auto result = Bindings::Merge(*empty_bindings, bindings); + assert_bindings_equal(result.get(), &bindings); } RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeRightIdentity, (nix::Bindings && bindings)) { - auto empty_bindings = nix::Bindings::NewGC(); - auto result = *Bindings::Merge(bindings, *empty_bindings); - assert_bindings_equal(result, bindings); + auto empty_bindings = nix::Bindings::New(); + auto result = Bindings::Merge(bindings, *empty_bindings); + assert_bindings_equal(result.get(), &bindings); } RC_GTEST_FIXTURE_PROP(AttrSetMonoidTest, mergeAssociative, (nix::Bindings && bindings_1, nix::Bindings&& bindings_2, nix::Bindings&& bindings_3)) { - assert_bindings_equal( - *Bindings::Merge(bindings_1, *Bindings::Merge(bindings_2, bindings_3)), - *Bindings::Merge(*Bindings::Merge(bindings_1, bindings_2), bindings_3)); + auto b231 = + Bindings::Merge(bindings_1, *Bindings::Merge(bindings_2, bindings_3)); + auto b123 = + Bindings::Merge(*Bindings::Merge(bindings_1, bindings_2), bindings_3); + assert_bindings_equal(b231.get(), b123.get()); } } // namespace nix -- cgit 1.4.1