maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
This reverts commit ef54f5da9f.

Resolved conflicts:
	third_party/nix/src/libexpr/eval.cc
	third_party/nix/src/libstore/builtins/fetchurl.cc
	third_party/nix/src/libstore/references.cc
	third_party/nix/src/libutil/hash.cc
	third_party/nix/src/nix-daemon/nix-daemon.cc

Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/tests/attr-set.cc vendored
View file

@ -113,7 +113,7 @@ using nix::tests::DummyStore;
class AttrSetTest : public ::testing::Test {
protected:
EvalState* eval_state_{};
EvalState* eval_state_;
void SetUp() override {
nix::initGC();
auto store = std::make_shared<DummyStore>();
@ -122,8 +122,8 @@ class AttrSetTest : public ::testing::Test {
}
void assert_bindings_equal(nix::Bindings& lhs, nix::Bindings& rhs) {
Value lhs_val{};
Value rhs_val{};
Value lhs_val;
Value rhs_val;
lhs_val.type = rhs_val.type = ValueType::tAttrs;
lhs_val.attrs = &lhs;
rhs_val.attrs = &lhs;

4
third_party/nix/src/tests/language-tests.cc vendored
View file

@ -181,7 +181,7 @@ TEST_P(EvalFailureTest, Fails) {
// Again, there are multiple expected exception types and the tests
// don't specify which ones they are looking for.
try {
Value result{};
Value result;
state.eval(expr, result);
state.forceValue(result);
std::cout << result;
@ -216,7 +216,7 @@ TEST_P(EvalSuccessTest, Fails) {
ASSERT_NO_THROW(expr = state.parseExprFromFile(GetParam().string()))
<< path.stem().string() << ": should parse successfully";
Value result{};
Value result;
ASSERT_NO_THROW({
state.eval(expr, result);

40
third_party/nix/src/tests/value-to-json.cc vendored
View file

@ -12,9 +12,9 @@
class ValueTest : public ::testing::Test {
protected:
static void SetUpTestSuite() { nix::initGC(); }
static void SetUpTestCase() { nix::initGC(); }
static void TearDownTestSuite() {}
static void TearDownTestCase() {}
};
class JSONValueTest : public ValueTest {};
@ -26,7 +26,7 @@ using nix::tests::DummyStore;
TEST_F(JSONValueTest, null) {
std::stringstream ss;
Value v{};
Value v;
PathSet ps;
std::shared_ptr<Store> store = std::make_shared<DummyStore>();
EvalState s({}, ref<Store>(store));
@ -40,7 +40,7 @@ TEST_F(JSONValueTest, BoolFalse) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkBool(v, false);
@ -52,7 +52,7 @@ TEST_F(JSONValueTest, BoolTrue) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkBool(v, true);
@ -64,7 +64,7 @@ TEST_F(JSONValueTest, IntPositive) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkInt(v, 100);
@ -76,7 +76,7 @@ TEST_F(JSONValueTest, IntNegative) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkInt(v, -100);
@ -88,7 +88,7 @@ TEST_F(JSONValueTest, String) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkString(v, "test");
@ -100,7 +100,7 @@ TEST_F(JSONValueTest, StringQuotes) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkString(v, "test\"");
@ -112,7 +112,7 @@ TEST_F(JSONValueTest, Path) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkPathNoCopy(v, "/exists-for-tests");
@ -124,7 +124,7 @@ TEST_F(JSONValueTest, PathNoCopy) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkPathNoCopy(v, "/exists-for-tests");
@ -141,7 +141,7 @@ TEST_F(JSONValueTest, PathNoCopy) {
TEST_F(XMLValueTest, null) {
std::stringstream ss;
Value v{};
Value v;
PathSet ps;
auto store = std::make_shared<DummyStore>();
EvalState s({}, ref<Store>(store));
@ -155,7 +155,7 @@ TEST_F(XMLValueTest, BoolFalse) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkBool(v, false);
@ -167,7 +167,7 @@ TEST_F(XMLValueTest, BoolTrue) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkBool(v, true);
@ -179,7 +179,7 @@ TEST_F(XMLValueTest, IntPositive) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkInt(v, 100);
@ -191,7 +191,7 @@ TEST_F(XMLValueTest, IntNegative) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkInt(v, -100);
@ -203,7 +203,7 @@ TEST_F(XMLValueTest, String) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkString(v, "test-value");
@ -215,7 +215,7 @@ TEST_F(XMLValueTest, StringQuotes) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkString(v, "test-value\"");
@ -231,7 +231,7 @@ TEST_F(XMLValueTest, Path) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkPath(v, "some-path");
@ -247,7 +247,7 @@ TEST_F(XMLValueTest, PathNoCopy) {
std::stringstream ss;
auto store = std::make_shared<DummyStore>();
EvalState s({"."}, ref<Store>(store));
Value v{};
Value v;
PathSet ps;
mkPathNoCopy(v, "some-other-path");