From 867055133d3f487e52dd44149f76347c2c28bf10 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 19 May 2020 18:55:58 +0100
Subject: style(3p/nix): Add braces around single-line conditionals

These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }'

[0]: https://github.com/dalance/amber
---
 third_party/nix/src/build-remote/build-remote.cc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'third_party/nix/src/build-remote')

diff --git a/third_party/nix/src/build-remote/build-remote.cc b/third_party/nix/src/build-remote/build-remote.cc
index cba4e969a767..dd7aea967923 100644
--- a/third_party/nix/src/build-remote/build-remote.cc
+++ b/third_party/nix/src/build-remote/build-remote.cc
@@ -40,7 +40,9 @@ static AutoCloseFD openSlotLock(const Machine& m, unsigned long long slot) {
 
 static bool allSupportedLocally(const std::set<std::string>& requiredFeatures) {
   for (auto& feature : requiredFeatures)
-    if (!settings.systemFeatures.get().count(feature)) return false;
+    if (!settings.systemFeatures.get().count(feature)) {
+      return false;
+    }
   return true;
 }
 
@@ -50,7 +52,9 @@ static int _main(int argc, char** argv) {
     unsetenv("DISPLAY");
     unsetenv("SSH_ASKPASS");
 
-    if (argc != 2) throw UsageError("called without required arguments");
+    if (argc != 2) {
+      throw UsageError("called without required arguments");
+    }
 
     FdSource source(STDIN_FILENO);
 
@@ -88,7 +92,9 @@ static int _main(int argc, char** argv) {
     while (true) {
       try {
         auto s = readString(source);
-        if (s != "try") return 0;
+        if (s != "try") {
+          return 0;
+        }
       } catch (EndOfFile&) {
         return 0;
       }
@@ -254,7 +260,9 @@ static int _main(int argc, char** argv) {
 
     PathSet missing;
     for (auto& path : outputs)
-      if (!store->isValidPath(path)) missing.insert(path);
+      if (!store->isValidPath(path)) {
+        missing.insert(path);
+      }
 
     if (!missing.empty()) {
       DLOG(INFO) << "copying outputs from '" << storeUri << "'";
-- 
cgit 1.4.1