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

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);