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

7
third_party/nix/src/libexpr/get-drvs.cc vendored
View file

@ -6,7 +6,6 @@
#include <absl/strings/numbers.h>
#include <glog/logging.h>
#include <math.h>
#include "libexpr/eval-inline.hh"
#include "libstore/derivations.hh"
@ -244,7 +243,7 @@ NixInt DrvInfo::queryMetaInt(const std::string& name, NixInt def) {
if (v->type == tString) {
/* Backwards compatibility with before we had support for
integer meta fields. */
NixInt n = 0;
NixInt n;
if (absl::SimpleAtoi(v->string.s, &n)) {
return n;
}
@ -263,7 +262,7 @@ NixFloat DrvInfo::queryMetaFloat(const std::string& name, NixFloat def) {
if (v->type == tString) {
/* Backwards compatibility with before we had support for
float meta fields. */
NixFloat n = NAN;
NixFloat n;
if (string2Float(v->string.s, n)) {
return n;
}
@ -368,7 +367,7 @@ static void getDerivations(EvalState& state, Value& vIn,
const std::string& pathPrefix, Bindings& autoArgs,
DrvInfos& drvs, Done& done,
bool ignoreAssertionFailures) {
Value v{};
Value v;
state.autoCallFunction(autoArgs, vIn, v);
/* Process the expression. */