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

Fixes mistakes introduced by clang-tidy in the previous commit.

1 files changed, 6 insertions, 12 deletions

diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc
index 19f6a46ed655..5d6f30c07d0c 100644
--- a/third_party/nix/src/libexpr/eval.cc
+++ b/third_party/nix/src/libexpr/eval.cc
@@ -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]);
     }
   };