diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-01T22·32-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-01T22·45+0000 |
| commit | 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 (patch) | |
| tree | eacd58ae5e0de9ffaadc265b8fd417f2f62d0433 /third_party/nix/src/libexpr/get-drvs.cc | |
| parent | cc3c45f739133162c840d500c0d633f46a524e06 (diff) | |
fix(3p/nix): revert "apply all clang-tidy fixes" r/1534
This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. 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
Diffstat (limited to 'third_party/nix/src/libexpr/get-drvs.cc')
| -rw-r--r-- | third_party/nix/src/libexpr/get-drvs.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/nix/src/libexpr/get-drvs.cc b/third_party/nix/src/libexpr/get-drvs.cc index fb5ada54c860..02ddae1f886c 100644 --- a/third_party/nix/src/libexpr/get-drvs.cc +++ b/third_party/nix/src/libexpr/get-drvs.cc @@ -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. */ |