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

chore(3p/nix/hash): prefer StatusOr over throwing constructor

Browse source 
The use of `unwrap_throw` can be used as a later grep target.

Change-Id: I8c54ed90c4289f07aecb8a1393dd10204c8bce4e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1493
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York 2020-07-27 19:57:04 -07:00 • committed by kanepyork
parent 2a292c71f4
commit 1cbffe21f3
15 changed files with 97 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -774,7 +774,8 @@ ValidPathInfo decodeValidPathInfo(std::istream& str, bool hashGiven) {
if (hashGiven) {
std::string s;
getline(str, s);
info.narHash = Hash(s, htSHA256);
auto hash_ = Hash::deserialize(s, htSHA256);
info.narHash = Hash::unwrap_throw(hash_);
getline(str, s);
if (!absl::SimpleAtoi(s, &info.narSize)) {
throw Error("number expected");
@ -829,7 +830,8 @@ bool ValidPathInfo::isContentAddressed(const Store& store) const {
};
if (absl::StartsWith(ca, "text:")) {
Hash hash(std::string(ca, 5));
auto hash_ = Hash::deserialize(std::string_view(ca).substr(5));
Hash hash = Hash::unwrap_throw(hash_);
if (store.makeTextPath(storePathToName(path), hash, references) == path) {
return true;
}
@ -839,7 +841,9 @@ bool ValidPathInfo::isContentAddressed(const Store& store) const {
else if (absl::StartsWith(ca, "fixed:")) {
bool recursive = ca.compare(6, 2, "r:") == 0;
Hash hash(std::string(ca, recursive ? 8 : 6));
auto hash_ =
Hash::deserialize(std::string_view(ca).substr(recursive ? 8 : 6));
Hash hash = Hash::unwrap_throw(hash_);
if (references.empty() &&
store.makeFixedOutputPath(recursive, hash, storePathToName(path)) ==
path) {