mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix/libstore): Additional if/for bracing fixes

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 19:40:31 +01:00
parent af7282536a
commit 83f4c37adf
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
third_party/nix/src/libstore/derivations.cc vendored
View file

@ -226,10 +226,11 @@ string Derivation::unparse() const {
bool first = true; bool first = true;
for (auto& i : outputs) { for (auto& i : outputs) {
if (first) if (first) {
first = false; first = false;
else } else {
s += ','; s += ',';
}
s += '('; s += '(';
printString(s, i.first); printString(s, i.first);
s += ','; s += ',';
@ -244,10 +245,11 @@ string Derivation::unparse() const {
s += "],["; s += "],[";
first = true; first = true;
for (auto& i : inputDrvs) { for (auto& i : inputDrvs) {
if (first) if (first) {
first = false; first = false;
else } else {
s += ','; s += ',';
}
s += '('; s += '(';
printString(s, i.first); printString(s, i.first);
s += ','; s += ',';
@ -268,10 +270,11 @@ string Derivation::unparse() const {
s += ",["; s += ",[";
first = true; first = true;
for (auto& i : env) { for (auto& i : env) {
if (first) if (first) {
first = false; first = false;
else } else {
s += ','; s += ',';
}
s += '('; s += '(';
printString(s, i.first); printString(s, i.first);
s += ','; s += ',';
@ -394,8 +397,9 @@ Source& readDerivation(Source& in, Store& store, BasicDerivation& drv) {
Sink& operator<<(Sink& out, const BasicDerivation& drv) { Sink& operator<<(Sink& out, const BasicDerivation& drv) {
out << drv.outputs.size(); out << drv.outputs.size();
for (auto& i : drv.outputs) for (auto& i : drv.outputs) {
out << i.first << i.second.path << i.second.hashAlgo << i.second.hash; out << i.first << i.second.path << i.second.hashAlgo << i.second.hash;
}
out << drv.inputSrcs << drv.platform << drv.builder << drv.args; out << drv.inputSrcs << drv.platform << drv.builder << drv.args;
out << drv.env.size(); out << drv.env.size();
for (auto& i : drv.env) { for (auto& i : drv.env) {