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

fix(3p/nix): Fix incorrectly braced conditionals and loops

Browse source 
Fixes mistakes introduced by clang-tidy in the previous commit.
This commit is contained in:
Vincent Ambo 2020-05-19 18:01:12 +01:00
parent b490742a51
commit 09cbc431cc
16 changed files with 62 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

18
third_party/nix/src/libexpr/eval.cc vendored
View file

@ -820,15 +820,12 @@ void ExprAttrs::eval(EvalState& state, Env& env, Value& v) {
newBnds->sort();
v.attrs = newBnds;
}
} else {
for (auto& i : attrs)
v.attrs->push_back(
Attr(i.first, i.second.e->maybeThunk(state, env), &i.second.pos));
}
else {
for
}
(auto& i
: attrs) v.attrs->push_back(Attr(i.first, i.second.e->maybeThunk(state, env),
&i.second.pos));
/* Dynamic attrs apply *after* rec and __overrides. */
for (auto& i : dynamicAttrs) {
Value nameVal;
@ -1350,9 +1347,8 @@ void ExprConcatStrings::eval(EvalState& state, Env& env, Value& v) {
auto path = canonPath(s.str());
mkPath(v, path.c_str());
} else {
mkString
mkString(v, s.str(), context);
}
(v, s.str(), context);
}
void ExprPos::eval(EvalState& state, Env& env, Value& v) {
@ -1378,9 +1374,7 @@ void EvalState::forceValueDeep(Value& v) {
i.name, *i.pos);
throw;
}
}
else if (v.isList()) {
} else if (v.isList()) {
for (size_t n = 0; n < v.listSize(); ++n) recurse(*v.listElems()[n]);
}
};