style(3p/nix): Enforce braces around loops and conditionals r/767

This change was generated with:

  fd -e cc -e hh | xargs -I{} clang-tidy {} -p ~/projects/nix-build/ \
    --checks='-*,readability-braces-around-statements' --fix \
    -fix-errors

Some manual fixes were applied because some convoluted unbraced
statements couldn't be untangled by clang-tidy.

This commit still includes invalid files, but I decided to clean them
up in a subsequent commit so that it becomes more obvious where
clang-tidy failed. Maybe this will allow for a bug-report to
clang-tidy.

1 files changed, 11 insertions, 8 deletions

diff --git a/third_party/nix/src/libstore/derivations.cc b/third_party/nix/src/libstore/derivations.cc
index 28f775dee1..454f483d16 100644
--- a/third_party/nix/src/libstore/derivations.cc
+++ b/third_party/nix/src/libstore/derivations.cc
@@ -185,19 +185,21 @@ Derivation Store::derivationFromPath(const Path& drvPath) {
 
 static void printString(string& res, const string& s) {
   res += '"';
-  for (const char* i = s.c_str(); *i; i++)
+  for (const char* i = s.c_str(); *i; i++) {
     if (*i == '\"' || *i == '\\') {
       res += "\\";
       res += *i;
-    } else if (*i == '\n')
+    } else if (*i == '\n') {
       res += "\\n";
-    else if (*i == '\r')
+    } else if (*i == '\r') {
       res += "\\r";
-    else if (*i == '\t')
+    } else if (*i == '\t') {
       res += "\\t";
-    else
+    } else {
       res += *i;
-  res += '"';
+    }
+    res += '"';
+  }
 }
 
 template <class ForwardIterator>
@@ -205,10 +207,11 @@ static void printStrings(string& res, ForwardIterator i, ForwardIterator j) {
   res += '[';
   bool first = true;
   for (; i != j; ++i) {
-    if (first)
+    if (first) {
       first = false;
-    else
+    } else {
       res += ',';
+    }
     printString(res, *i);
   }
   res += ']';