soenkehahn/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove some Base:: that crept in

Browse source
This commit is contained in:
John Ericson 2020-06-19 00:24:47 +00:00
parent 3f8dcfe3fd
commit 3fc58a9638
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/content-address.cc
View file

@ -31,7 +31,7 @@ template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
std::string renderContentAddress(ContentAddress ca) { std::string renderContentAddress(ContentAddress ca) {
return std::visit(overloaded { return std::visit(overloaded {
[](TextHash th) { [](TextHash th) {
return "text:" + th.hash.to_string(Base::Base32, true); return "text:" + th.hash.to_string(Base32, true);
}, },
[](FileSystemHash fsh) { [](FileSystemHash fsh) {
return makeFixedOutputCA(fsh.method, fsh.hash); return makeFixedOutputCA(fsh.method, fsh.hash);

4
src/libstore/derivations.cc
View file

@ -267,7 +267,7 @@ string Derivation::unparse(const Store & store, bool maskOutputs,
s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(i.second.path)); s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(i.second.path));
s += ','; printUnquotedString(s, i.second.hash ? i.second.hash->printMethodAlgo() : ""); s += ','; printUnquotedString(s, i.second.hash ? i.second.hash->printMethodAlgo() : "");
s += ','; printUnquotedString(s, s += ','; printUnquotedString(s,
i.second.hash ? i.second.hash->hash.to_string(Base::Base16, false) : ""); i.second.hash ? i.second.hash->hash.to_string(Base16, false) : "");
s += ')'; s += ')';
} }
@ -467,7 +467,7 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
out << i.first out << i.first
<< store.printStorePath(i.second.path) << store.printStorePath(i.second.path)
<< i.second.hash->printMethodAlgo() << i.second.hash->printMethodAlgo()
<< i.second.hash->hash.to_string(Base::Base16, false); << i.second.hash->hash.to_string(Base16, false);
writeStorePaths(store, out, drv.inputSrcs); writeStorePaths(store, out, drv.inputSrcs);
out << drv.platform << drv.builder << drv.args; out << drv.platform << drv.builder << drv.args;
out << drv.env.size(); out << drv.env.size();

2
src/libutil/hash.cc
View file

@ -223,7 +223,7 @@ Hash newHashAllowEmpty(std::string hashStr, std::optional<HashType> ht)
if (!ht) if (!ht)
throw BadHash("empty hash requires explicit hash type"); throw BadHash("empty hash requires explicit hash type");
Hash h(*ht); Hash h(*ht);
warn("found empty hash, assuming '%s'", h.to_string(Base::SRI, true)); warn("found empty hash, assuming '%s'", h.to_string(SRI, true));
return h; return h;
} else } else
return Hash(hashStr, ht); return Hash(hashStr, ht);

2
src/nix/show-derivation.cc
View file

@ -72,7 +72,7 @@ struct CmdShowDerivation : InstallablesCommand
outputObj.attr("path", store->printStorePath(output.second.path)); outputObj.attr("path", store->printStorePath(output.second.path));
if (output.second.hash) { if (output.second.hash) {
outputObj.attr("hashAlgo", output.second.hash->printMethodAlgo()); outputObj.attr("hashAlgo", output.second.hash->printMethodAlgo());
outputObj.attr("hash", output.second.hash->hash.to_string(Base::Base16, false)); outputObj.attr("hash", output.second.hash->hash.to_string(Base16, false));
} }
} }
} }