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

chore(3p/nix): apply google-readability-casting

Browse source 
Command run: jq <compile_commands.json -r 'map(.file)|.[]' | grep -v '/generated/' | parallel clang-tidy -p compile_commands.json -checks=-*,google-readability-casting --fix

Manual fixes applied in src/nix-env/nix-env.cc, src/libstore/store-api.cc

Change-Id: I406b4be9368c557ca59329bf6f7002704e955f8d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1557
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-08-01 17:17:44 -07:00 • committed by kanepyork
parent 053a138002
commit 1de00e6c42
40 changed files with 161 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/nix-build/nix-build.cc vendored
View file

@ -156,7 +156,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));
@ -455,7 +455,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 {
@ -469,7 +469,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) +
@ -488,7 +488,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") + "'; ")