style(3p/nix): Final act in the brace-wrapping saga r/777

This last change set was generated by a full clang-tidy run (including
compilation):

    clang-tidy -p ~/projects/nix-build/ \
      -checks=-*,readability-braces-around-statements -fix src/*/*.cc

Actually running clang-tidy requires some massaging to make it play
nice with Nix + meson, I'll be adding a wrapper or something for that soon.

2 files changed, 11 insertions, 5 deletions

diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc
index 3df83733ad08..332bd5c4caee 100644
--- a/third_party/nix/src/libmain/shared.cc
+++ b/third_party/nix/src/libmain/shared.cc
@@ -233,7 +233,9 @@ bool LegacyArgs::processFlag(Strings::iterator& pos, Strings::iterator end) {
     return true;
   }
   bool res = parseArg(pos, end);
-  if (res) ++pos;
+  if (res) {
+    ++pos;
+  }
   return res;
 }
 
@@ -244,8 +246,9 @@ bool LegacyArgs::processArgs(const Strings& args, bool finish) {
   assert(args.size() == 1);
   Strings ss(args);
   auto pos = ss.begin();
-  if (!parseArg(pos, ss.end()))
+  if (!parseArg(pos, ss.end())) {
     throw UsageError(format("unexpected argument '%1%'") % args.front());
+  }
   return true;
 }
 
@@ -346,8 +349,9 @@ RunPager::RunPager() {
   toPager.create();
 
   pid = startProcess([&]() {
-    if (dup2(toPager.readSide.get(), STDIN_FILENO) == -1)
+    if (dup2(toPager.readSide.get(), STDIN_FILENO) == -1) {
       throw SysError("dupping stdin");
+    }
     if (!getenv("LESS")) {
       setenv("LESS", "FRSXMK", 1);
     }
@@ -363,8 +367,9 @@ RunPager::RunPager() {
 
   pid.setKillSignal(SIGINT);
 
-  if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1)
+  if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1) {
     throw SysError("dupping stdout");
+  }
 }
 
 RunPager::~RunPager() {
diff --git a/third_party/nix/src/libmain/stack.cc b/third_party/nix/src/libmain/stack.cc
index 0d5b91c163c7..27c16f5d1f6b 100644
--- a/third_party/nix/src/libmain/stack.cc
+++ b/third_party/nix/src/libmain/stack.cc
@@ -58,8 +58,9 @@ void detectStackOverflow() {
     throw Error("cannot allocate alternative stack");
   }
   stack.ss_flags = 0;
-  if (sigaltstack(&stack, 0) == -1)
+  if (sigaltstack(&stack, 0) == -1) {
     throw SysError("cannot set alternative stack");
+  }
 
   struct sigaction act;
   sigfillset(&act.sa_mask);