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.

2 files changed, 11 insertions, 7 deletions

diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc
index 05ae04714f..dfa5be0897 100644
--- a/third_party/nix/src/libmain/shared.cc
+++ b/third_party/nix/src/libmain/shared.cc
@@ -23,7 +23,9 @@ namespace nix {
 static bool gcWarning = true;
 
 void printGCWarning() {
-  if (!gcWarning) return;
+  if (!gcWarning) {
+    return;
+  }
 
   static bool haveWarned = false;
   if (!haveWarned) {
diff --git a/third_party/nix/src/libmain/shared.hh b/third_party/nix/src/libmain/shared.hh
index 2f9bc1a72a..337c38413d 100644
--- a/third_party/nix/src/libmain/shared.hh
+++ b/third_party/nix/src/libmain/shared.hh
@@ -59,16 +59,18 @@ N getIntArg(const string& opt, Strings::iterator& i,
   if (allowUnit && !s.empty()) {
     char u = std::toupper(*s.rbegin());
     if (std::isalpha(u)) {
-      if (u == 'K')
+      if (u == 'K') {
         multiplier = 1ULL << 10;
-      else if (u == 'M')
+      } else if (u == 'M') {
         multiplier = 1ULL << 20;
-      else if (u == 'G')
+      } else if (u == 'G') {
         multiplier = 1ULL << 30;
-      else if (u == 'T')
+      } else if (u == 'T') {
         multiplier = 1ULL << 40;
-      else
-        throw UsageError(format("invalid unit specifier '%1%'") % u);
+      } else {
+        throw
+      }
+      UsageError(format("invalid unit specifier '%1%'") % u);
       s.resize(s.size() - 1);
     }
   }