diff options
author | Kane York <kanepyork@gmail.com> | 2020-07-25T04·09-0700 |
---|---|---|
committer | kanepyork <rikingcoding@gmail.com> | 2020-07-27T21·16+0000 |
commit | ef54f5da9fa30b5c302f2a49595ee5d041f9706a (patch) | |
tree | 8d1da709a2e2d3b135d1e84eda9c402bde467726 /third_party/nix/src/nix-build | |
parent | 69f402563a14d4b668980e4228d033d80e3bb05d (diff) |
fix(3p/nix): apply all clang-tidy fixes r/1495
Change-Id: I265e763393422ee1881653527c91024458060825 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/nix/src/nix-build')
-rw-r--r-- | third_party/nix/src/nix-build/nix-build.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/nix/src/nix-build/nix-build.cc b/third_party/nix/src/nix-build/nix-build.cc index 7ebb14e1f319..d2a4a23cca26 100644 --- a/third_party/nix/src/nix-build/nix-build.cc +++ b/third_party/nix/src/nix-build/nix-build.cc @@ -155,7 +155,7 @@ static void _main(int argc, char** argv) { ; // obsolete } else if (*arg == "--no-out-link" || *arg == "--no-link") { - outLink = (Path)tmpDir + "/result"; + outLink = Path(tmpDir) + "/result"; } else if (*arg == "--attr" || *arg == "-A") { attrPaths.push_back(getArg(*arg, arg, end)); @@ -328,7 +328,7 @@ static void _main(int argc, char** argv) { } for (auto e : exprs) { - Value vRoot; + Value vRoot{}; state->eval(e, vRoot); for (auto& i : attrPaths) { @@ -343,8 +343,8 @@ static void _main(int argc, char** argv) { auto buildPaths = [&](const PathSet& paths) { /* Note: we do this even when !printMissing to efficiently fetch binary cache data. */ - unsigned long long downloadSize; - unsigned long long narSize; + unsigned long long downloadSize = 0; + unsigned long long narSize = 0; PathSet willBuild; PathSet willSubstitute; PathSet unknown; @@ -381,7 +381,7 @@ static void _main(int argc, char** argv) { auto expr = state->parseExprFromString( "(import <nixpkgs> {}).bashInteractive", absPath(".")); - Value v; + Value v{}; state->eval(expr, v); auto drv = getDerivation(*state, v, false); @@ -453,7 +453,7 @@ static void _main(int argc, char** argv) { if (passAsFile.count(var.first) != 0u) { keepTmp = true; std::string fn = ".attr-" + std::to_string(fileNr++); - Path p = (Path)tmpDir + "/" + fn; + Path p = Path(tmpDir) + "/" + fn; writeFile(p, var.second); env[var.first + "Path"] = p; } else { @@ -467,7 +467,7 @@ static void _main(int argc, char** argv) { convenience, source $stdenv/setup to setup additional environment variables and shell functions. Also don't lose the current $PATH directories. */ - auto rcfile = (Path)tmpDir + "/rc"; + auto rcfile = Path(tmpDir) + "/rc"; writeFile( rcfile, fmt((keepTmp ? "" : "rm -rf '%1%'; "s) + @@ -486,7 +486,7 @@ static void _main(int argc, char** argv) { "shopt -u nullglob; " "unset TZ; %6%" "%7%", - (Path)tmpDir, (pure ? "" : "p=$PATH; "), + Path(tmpDir), (pure ? "" : "p=$PATH; "), (pure ? "" : "PATH=$PATH:$p; unset p; "), dirOf(shell), shell, (getenv("TZ") != nullptr ? (std::string("export TZ='") + getenv("TZ") + "'; ") |