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

6
third_party/nix/src/libstore/store-api.cc vendored
View file

@ -304,8 +304,8 @@ Path Store::makeFixedOutputPath(bool recursive, const Hash& hash,
"output:out",
hashString(
htSHA256,
"fixed:out:" + (recursive ? (std::string) "r:" : "") +
hash.to_string(Base16) + ":"),
absl::StrCat("fixed:out:", (recursive ? "r:" : ""),
hash.to_string(Base16), ":")),
name);
}
@ -926,7 +926,7 @@ Strings ValidPathInfo::shortRefs() const {
}
std::string makeFixedOutputCA(bool recursive, const Hash& hash) {
return "fixed:" + (recursive ? (std::string) "r:" : "") + hash.to_string();
return "fixed:" + (recursive ? std::string("r:") : "") + hash.to_string();
}
void Store::addToStore(const ValidPathInfo& info, Source& narSource,