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

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

@ -262,7 +262,7 @@ Path Store::makeFixedOutputPath(bool recursive, const Hash& hash,
"output:out",
hashString(
htSHA256,
"fixed:out:" + (recursive ? std::string("r:") : "") +
"fixed:out:" + (recursive ? (std::string) "r:" : "") +
hash.to_string(Base16) + ":"),
name);
}
@ -783,7 +783,7 @@ ValidPathInfo decodeValidPathInfo(std::istream& str, bool hashGiven) {
}
getline(str, info.deriver);
std::string s;
int n = 0;
int n;
getline(str, s);
if (!absl::SimpleAtoi(s, &n)) {
throw Error("number expected");
@ -884,7 +884,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,
@ -930,8 +930,7 @@ std::pair<std::string, Store::Params> splitUriAndParams(
throw Error("invalid URI parameter '%s'", value);
}
try {
decoded += std::to_string(
std::stoul(std::string(value, i + 1, 2), nullptr, 16));
decoded += std::stoul(std::string(value, i + 1, 2), nullptr, 16);
i += 3;
} catch (...) {
throw Error("invalid URI parameter '%s'", value);