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, 5 insertions, 2 deletions

diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc
index 39c908afed..a4cb98fe7f 100644
--- a/third_party/nix/src/libstore/remote-store.cc
+++ b/third_party/nix/src/libstore/remote-store.cc
@@ -33,7 +33,9 @@ Path readStorePath(Store& store, Source& from) {
 template <class T>
 T readStorePaths(Store& store, Source& from) {
   T paths = readStrings<T>(from);
-  for (auto& i : paths) store.assertStorePath(i);
+  for (auto& i : paths) {
+    store.assertStorePath(i);
+  }
   return paths;
 }
 
@@ -600,10 +602,11 @@ void RemoteStore::queryMissing(const PathSet& targets, PathSet& willBuild,
                                unsigned long long& narSize) {
   {
     auto conn(getConnection());
-    if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 19)
+    if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 19) {
       // Don't hold the connection handle in the fallback case
       // to prevent a deadlock.
       goto fallback;
+    }
     conn->to << wopQueryMissing << targets;
     conn.processStderr();
     willBuild = readStorePaths<PathSet>(*this, conn->from);