Add braces to C++ single-line loops and conditionals (NFC) (#2973)

This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2026-06-22 01:11:42 +00:00 · 2020-12-28 12:58:06 -08:00
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
--- a/wpiutil/src/test/native/cpp/Base64Test.cpp
+++ b/wpiutil/src/test/native/cpp/Base64Test.cpp
@@ -24,10 +24,11 @@ std::ostream& operator<<(std::ostream& os, const Base64TestParam& param) {
 class Base64Test : public ::testing::TestWithParam<Base64TestParam> {
 protected:
  StringRef GetPlain() {
-    if (GetParam().plain_len < 0)
+    if (GetParam().plain_len < 0) {
      return StringRef(GetParam().plain);
-    else
+    } else {
      return StringRef(GetParam().plain, GetParam().plain_len);
+    }
  }
 };

--- a/wpiutil/src/test/native/cpp/UidVectorTest.cpp
+++ b/wpiutil/src/test/native/cpp/UidVectorTest.cpp
@@ -36,7 +36,9 @@ TEST(UidVectorTest, Iterate) {
  v.emplace_back(2);
  v.emplace_back(1);
  std::vector<int> out;
-  for (auto&& val : v) out.push_back(val);
+  for (auto&& val : v) {
+    out.push_back(val);
+  }
  ASSERT_EQ(out.size(), 2u);
  EXPECT_EQ(out[0], 2);
  EXPECT_EQ(out[1], 1);
--- a/wpiutil/src/test/native/cpp/WebSocketClientTest.cpp
+++ b/wpiutil/src/test/native/cpp/WebSocketClientTest.cpp
@@ -19,7 +19,9 @@ class WebSocketClientTest : public WebSocketTest {
    // Bare bones server
    req.header.connect([this](StringRef name, StringRef value) {
      // save key (required for valid response)
-      if (name.equals_lower("sec-websocket-key")) clientKey = value;
+      if (name.equals_lower("sec-websocket-key")) {
+        clientKey = value;
+      }
    });
    req.headersComplete.connect([this](bool) {
      // send response
@@ -33,23 +35,30 @@ class WebSocketClientTest : public WebSocketTest {
      SHA1 hash;
      hash.Update(clientKey);
      hash.Update("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
-      if (mockBadAccept) hash.Update("1");
+      if (mockBadAccept) {
+        hash.Update("1");
+      }
      SmallString<64> hashBuf;
      SmallString<64> acceptBuf;
      os << "Sec-WebSocket-Accept: "
         << Base64Encode(hash.RawFinal(hashBuf), acceptBuf) << "\r\n";

-      if (!mockProtocol.empty())
+      if (!mockProtocol.empty()) {
        os << "Sec-WebSocket-Protocol: " << mockProtocol << "\r\n";
+      }

      os << "\r\n";

      conn->Write(bufs, [](auto bufs, uv::Error) {
-        for (auto& buf : bufs) buf.Deallocate();
+        for (auto& buf : bufs) {
+          buf.Deallocate();
+        }
      });

      serverHeadersDone = true;
-      if (connected) connected();
+      if (connected) {
+        connected();
+      }
    });

    serverPipe->Listen([this] {
@@ -59,9 +68,13 @@ class WebSocketClientTest : public WebSocketTest {
        StringRef data{buf.base, size};
        if (!serverHeadersDone) {
          data = req.Execute(data);
-          if (req.HasError()) Finish();
+          if (req.HasError()) {
+            Finish();
+          }
          ASSERT_EQ(req.GetError(), HPE_OK) << http_errno_name(req.GetError());
-          if (data.empty()) return;
+          if (data.empty()) {
+            return;
+          }
        }
        wireData.insert(wireData.end(), data.bytes_begin(), data.bytes_end());
      });
@@ -86,8 +99,9 @@ TEST_F(WebSocketClientTest, Open) {
    auto ws = WebSocket::CreateClient(*clientPipe, "/test", pipeName);
    ws->closed.connect([&](uint16_t code, StringRef reason) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << " Reason: " << reason;
+      }
    });
    ws->open.connect([&](StringRef protocol) {
      ++gotOpen;
@@ -98,7 +112,9 @@ TEST_F(WebSocketClientTest, Open) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotOpen, 1);
 }

@@ -122,7 +138,9 @@ TEST_F(WebSocketClientTest, BadAccept) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotClosed, 1);
 }

@@ -136,8 +154,9 @@ TEST_F(WebSocketClientTest, ProtocolGood) {
                                      {"myProtocol", "myProtocol2"});
    ws->closed.connect([&](uint16_t code, StringRef msg) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << "Message: " << msg;
+      }
    });
    ws->open.connect([&](StringRef protocol) {
      ++gotOpen;
@@ -148,7 +167,9 @@ TEST_F(WebSocketClientTest, ProtocolGood) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotOpen, 1);
 }

@@ -172,7 +193,9 @@ TEST_F(WebSocketClientTest, ProtocolRespNotReq) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotClosed, 1);
 }

@@ -195,7 +218,9 @@ TEST_F(WebSocketClientTest, ProtocolReqNotResp) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotClosed, 1);
 }

@@ -210,7 +235,9 @@ class WebSocketClientDataTest : public WebSocketClientTest,
  WebSocketClientDataTest() {
    clientPipe->Connect(pipeName, [&] {
      ws = WebSocket::CreateClient(*clientPipe, "/test", pipeName);
-      if (setupWebSocket) setupWebSocket();
+      if (setupWebSocket) {
+        setupWebSocket();
+      }
    });
  }

--- a/wpiutil/src/test/native/cpp/WebSocketIntegrationTest.cpp
+++ b/wpiutil/src/test/native/cpp/WebSocketIntegrationTest.cpp
@@ -29,8 +29,9 @@ TEST_F(WebSocketIntegrationTest, Open) {
    auto ws = WebSocket::CreateClient(*clientPipe, "/test", pipeName);
    ws->closed.connect([&](uint16_t code, StringRef reason) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << " Reason: " << reason;
+      }
    });
    ws->open.connect([&, s = ws.get()](StringRef) {
      ++gotClientOpen;
@@ -62,8 +63,9 @@ TEST_F(WebSocketIntegrationTest, Protocol) {
        WebSocket::CreateClient(*clientPipe, "/test", pipeName, {"proto1"});
    ws->closed.connect([&](uint16_t code, StringRef reason) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << " Reason: " << reason;
+      }
    });
    ws->open.connect([&, s = ws.get()](StringRef protocol) {
      ++gotClientOpen;
@@ -94,8 +96,9 @@ TEST_F(WebSocketIntegrationTest, ServerSendBinary) {
    auto ws = WebSocket::CreateClient(*clientPipe, "/test", pipeName);
    ws->closed.connect([&](uint16_t code, StringRef reason) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << " Reason: " << reason;
+      }
    });
    ws->binary.connect([&](ArrayRef<uint8_t> data, bool) {
      ++gotData;
@@ -128,8 +131,9 @@ TEST_F(WebSocketIntegrationTest, ClientSendText) {
    auto ws = WebSocket::CreateClient(*clientPipe, "/test", pipeName);
    ws->closed.connect([&](uint16_t code, StringRef reason) {
      Finish();
-      if (code != 1005 && code != 1006)
+      if (code != 1005 && code != 1006) {
        FAIL() << "Code: " << code << " Reason: " << reason;
+      }
    });
    ws->open.connect([&, s = ws.get()](StringRef) {
      s->SendText(uv::Buffer{"hello"}, [&](auto, uv::Error) {});
--- a/wpiutil/src/test/native/cpp/WebSocketServerTest.cpp
+++ b/wpiutil/src/test/native/cpp/WebSocketServerTest.cpp
@@ -21,7 +21,9 @@ class WebSocketServerTest : public WebSocketTest {
    serverPipe->Listen([this]() {
      auto conn = serverPipe->Accept();
      ws = WebSocket::CreateServer(*conn, "foo", "13");
-      if (setupWebSocket) setupWebSocket();
+      if (setupWebSocket) {
+        setupWebSocket();
+      }
    });
    clientPipe->Connect(pipeName, [this]() {
      clientPipe->StartRead();
@@ -29,13 +31,19 @@ class WebSocketServerTest : public WebSocketTest {
        StringRef data{buf.base, size};
        if (!headersDone) {
          data = resp.Execute(data);
-          if (resp.HasError()) Finish();
+          if (resp.HasError()) {
+            Finish();
+          }
          ASSERT_EQ(resp.GetError(), HPE_OK)
              << http_errno_name(resp.GetError());
-          if (data.empty()) return;
+          if (data.empty()) {
+            return;
+          }
        }
        wireData.insert(wireData.end(), data.bytes_begin(), data.bytes_end());
-        if (handleData) handleData(data);
+        if (handleData) {
+          handleData(data);
+        }
      });
      clientPipe->end.connect([this]() { Finish(); });
    });
--- a/wpiutil/src/test/native/cpp/WebSocketTest.cpp
+++ b/wpiutil/src/test/native/cpp/WebSocketTest.cpp
@@ -35,9 +35,13 @@ std::vector<uint8_t> WebSocketTest::BuildHeader(uint8_t opcode, bool fin,
    data.push_back(len & 0xff);
  } else {
    data.push_back(127u | (masking ? 0x80u : 0x00u));
-    for (int i = 56; i >= 0; i -= 8) data.push_back((len >> i) & 0xff);
+    for (int i = 56; i >= 0; i -= 8) {
+      data.push_back((len >> i) & 0xff);
+    }
+  }
+  if (masking) {
+    data.insert(data.end(), &testMask[0], &testMask[4]);
  }
-  if (masking) data.insert(data.end(), &testMask[0], &testMask[4]);
  return data;
 }

@@ -53,7 +57,9 @@ std::vector<uint8_t> WebSocketTest::BuildMessage(uint8_t opcode, bool fin,
    int n = 0;
    for (size_t i = headerSize, end = finalData.size(); i < end; ++i) {
      finalData[i] ^= mask[n++];
-      if (n >= 4) n = 0;
+      if (n >= 4) {
+        n = 0;
+      }
    }
  }
  return finalData;
@@ -62,16 +68,21 @@ std::vector<uint8_t> WebSocketTest::BuildMessage(uint8_t opcode, bool fin,
 // If the message is masked, changes the mask to match the mask set by
 // BuildHeader() by unmasking and remasking.
 void WebSocketTest::AdjustMasking(MutableArrayRef<uint8_t> message) {
-  if (message.size() < 2) return;
-  if ((message[1] & 0x80) == 0) return;  // not masked
+  if (message.size() < 2) {
+    return;
+  }
+  if ((message[1] & 0x80) == 0) {
+    return;  // not masked
+  }
  size_t maskPos;
  uint8_t len = message[1] & 0x7f;
-  if (len == 126)
+  if (len == 126) {
    maskPos = 4;
-  else if (len == 127)
+  } else if (len == 127) {
    maskPos = 10;
-  else
+  } else {
    maskPos = 2;
+  }
  uint8_t mask[4] = {message[maskPos], message[maskPos + 1],
                     message[maskPos + 2], message[maskPos + 3]};
  message[maskPos] = testMask[0];
@@ -81,7 +92,9 @@ void WebSocketTest::AdjustMasking(MutableArrayRef<uint8_t> message) {
  int n = 0;
  for (auto& ch : message.slice(maskPos + 4)) {
    ch ^= mask[n] ^ testMask[n];
-    if (++n >= 4) n = 0;
+    if (++n >= 4) {
+      n = 0;
+    }
  }
 }

@@ -120,7 +133,9 @@ TEST_F(WebSocketTest, CreateClientBasic) {
    conn->StartRead();
    conn->data.connect([&](uv::Buffer& buf, size_t size) {
      req.Execute(StringRef{buf.base, size});
-      if (req.HasError()) Finish();
+      if (req.HasError()) {
+        Finish();
+      }
      ASSERT_EQ(req.GetError(), HPE_OK) << http_errno_name(req.GetError());
    });
  });
@@ -130,7 +145,9 @@ TEST_F(WebSocketTest, CreateClientBasic) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotHost, 1);
  ASSERT_EQ(gotUpgrade, 1);
  ASSERT_EQ(gotConnection, 1);
@@ -158,7 +175,9 @@ TEST_F(WebSocketTest, CreateClientExtraHeaders) {
    conn->StartRead();
    conn->data.connect([&](uv::Buffer& buf, size_t size) {
      req.Execute(StringRef{buf.base, size});
-      if (req.HasError()) Finish();
+      if (req.HasError()) {
+        Finish();
+      }
      ASSERT_EQ(req.GetError(), HPE_OK) << http_errno_name(req.GetError());
    });
  });
@@ -174,7 +193,9 @@ TEST_F(WebSocketTest, CreateClientExtraHeaders) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotExtra1, 1);
  ASSERT_EQ(gotExtra2, 1);
 }
@@ -196,7 +217,9 @@ TEST_F(WebSocketTest, CreateClientTimeout) {

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotClosed, 1);
 }

@@ -240,14 +263,18 @@ TEST_F(WebSocketTest, CreateServerBasic) {
    clientPipe->StartRead();
    clientPipe->data.connect([&](uv::Buffer& buf, size_t size) {
      resp.Execute(StringRef{buf.base, size});
-      if (resp.HasError()) Finish();
+      if (resp.HasError()) {
+        Finish();
+      }
      ASSERT_EQ(resp.GetError(), HPE_OK) << http_errno_name(resp.GetError());
    });
  });

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotStatus, 1);
  ASSERT_EQ(gotUpgrade, 1);
  ASSERT_EQ(gotConnection, 1);
@@ -280,14 +307,18 @@ TEST_F(WebSocketTest, CreateServerProtocol) {
    clientPipe->StartRead();
    clientPipe->data.connect([&](uv::Buffer& buf, size_t size) {
      resp.Execute(StringRef{buf.base, size});
-      if (resp.HasError()) Finish();
+      if (resp.HasError()) {
+        Finish();
+      }
      ASSERT_EQ(resp.GetError(), HPE_OK) << http_errno_name(resp.GetError());
    });
  });

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotProtocol, 1);
  ASSERT_EQ(gotOpen, 1);
 }
@@ -327,14 +358,18 @@ TEST_F(WebSocketTest, CreateServerBadVersion) {
    clientPipe->StartRead();
    clientPipe->data.connect([&](uv::Buffer& buf, size_t size) {
      resp.Execute(StringRef{buf.base, size});
-      if (resp.HasError()) Finish();
+      if (resp.HasError()) {
+        Finish();
+      }
      ASSERT_EQ(resp.GetError(), HPE_OK) << http_errno_name(resp.GetError());
    });
  });

  loop->Run();

-  if (HasFatalFailure()) return;
+  if (HasFatalFailure()) {
+    return;
+  }
  ASSERT_EQ(gotStatus, 1);
  ASSERT_EQ(gotVersion, 1);
  ASSERT_EQ(gotUpgrade, 1);
--- a/wpiutil/src/test/native/cpp/hostname.cpp
+++ b/wpiutil/src/test/native/cpp/hostname.cpp
@@ -9,7 +9,9 @@
 #include "wpi/SmallVector.h"

 namespace wpi {
-TEST(HostNameTest, HostNameNotEmpty) { ASSERT_NE(GetHostname(), ""); }
+TEST(HostNameTest, HostNameNotEmpty) {
+  ASSERT_NE(GetHostname(), "");
+}
 TEST(HostNameTest, HostNameNotEmptySmallVector) {
  SmallVector<char, 256> name;
  ASSERT_NE(GetHostname(name), "");
--- a/wpiutil/src/test/native/cpp/sigslot/signal-threaded.cpp
+++ b/wpiutil/src/test/native/cpp/sigslot/signal-threaded.cpp
@@ -45,16 +45,22 @@ namespace {

 std::atomic<int> sum{0};

-void f(int i) { sum += i; }
+void f(int i) {
+  sum += i;
+}

 void emit_many(Signal_mt<int>& sig) {
-  for (int i = 0; i < 10000; ++i) sig(1);
+  for (int i = 0; i < 10000; ++i) {
+    sig(1);
+  }
 }

 void connect_emit(Signal_mt<int>& sig) {
  for (int i = 0; i < 100; ++i) {
    auto s = sig.connect_scoped(f);
-    for (int j = 0; j < 100; ++j) sig(1);
+    for (int j = 0; j < 100; ++j) {
+      sig(1);
+    }
  }
 }

@@ -68,9 +74,13 @@ TEST(Signal, ThreadedMix) {
  Signal_mt<int> sig;

  std::array<std::thread, 10> threads;
-  for (auto& t : threads) t = std::thread(connect_emit, std::ref(sig));
+  for (auto& t : threads) {
+    t = std::thread(connect_emit, std::ref(sig));
+  }

-  for (auto& t : threads) t.join();
+  for (auto& t : threads) {
+    t.join();
+  }
 }

 TEST(Signal, ThreadedEmission) {
@@ -80,9 +90,13 @@ TEST(Signal, ThreadedEmission) {
  sig.connect(f);

  std::array<std::thread, 10> threads;
-  for (auto& t : threads) t = std::thread(emit_many, std::ref(sig));
+  for (auto& t : threads) {
+    t = std::thread(emit_many, std::ref(sig));
+  }

-  for (auto& t : threads) t.join();
+  for (auto& t : threads) {
+    t.join();
+  }

  ASSERT_EQ(sum, 100000);
 }
--- a/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp
+++ b/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp
@@ -45,7 +45,9 @@ namespace {

 int sum = 0;

-void f1(int i) { sum += i; }
+void f1(int i) {
+  sum += i;
+}
 struct o1 {
  void operator()(int i) { sum += 2 * i; }
 };
--- a/wpiutil/src/test/native/cpp/sigslot/signal.cpp
+++ b/wpiutil/src/test/native/cpp/sigslot/signal.cpp
@@ -45,8 +45,12 @@ namespace {

 int sum = 0;

-void f1(int i) { sum += i; }
-void f2(int i) /*noexcept*/ { sum += 2 * i; }
+void f1(int i) {
+  sum += i;
+}
+void f2(int i) /*noexcept*/ {
+  sum += 2 * i;
+}

 struct s {
  static void s1(int i) { sum += i; }
--- a/wpiutil/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp
+++ b/wpiutil/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp
@@ -29,7 +29,9 @@ TEST(UvAsyncFunction, Test) {

  prepare->error.connect([](Error) { FAIL(); });
  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      auto call0 = async->Call(0);
      auto call1 = async->Call(1);
@@ -56,7 +58,9 @@ TEST(UvAsyncFunction, Test) {
  ASSERT_EQ(async_cb_called[1], 1);
  ASSERT_EQ(close_cb_called, 1);

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, Ref) {
@@ -70,7 +74,9 @@ TEST(UvAsyncFunction, Ref) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] { ASSERT_EQ(async->Call(1, val).get(), 2); });
  });
  prepare->Start();
@@ -86,7 +92,9 @@ TEST(UvAsyncFunction, Ref) {

  ASSERT_EQ(val, 1);

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, Movable) {
@@ -100,7 +108,9 @@ TEST(UvAsyncFunction, Movable) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      auto val = std::make_unique<int>(1);
      auto val2 = async->Call(std::move(val)).get();
@@ -119,7 +129,9 @@ TEST(UvAsyncFunction, Movable) {

  loop->Run();

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, CallIgnoreResult) {
@@ -133,7 +145,9 @@ TEST(UvAsyncFunction, CallIgnoreResult) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] { async->Call(std::make_unique<int>(1)); });
  });
  prepare->Start();
@@ -147,7 +161,9 @@ TEST(UvAsyncFunction, CallIgnoreResult) {

  loop->Run();

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, VoidCall) {
@@ -160,7 +176,9 @@ TEST(UvAsyncFunction, VoidCall) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] { async->Call(); });
  });
  prepare->Start();
@@ -173,7 +191,9 @@ TEST(UvAsyncFunction, VoidCall) {

  loop->Run();

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, WaitFor) {
@@ -186,7 +206,9 @@ TEST(UvAsyncFunction, WaitFor) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      ASSERT_FALSE(async->Call().wait_for(std::chrono::milliseconds(10)));
    });
@@ -202,7 +224,9 @@ TEST(UvAsyncFunction, WaitFor) {

  loop->Run();

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsyncFunction, VoidWaitFor) {
@@ -215,7 +239,9 @@ TEST(UvAsyncFunction, VoidWaitFor) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      ASSERT_FALSE(async->Call().wait_for(std::chrono::milliseconds(10)));
    });
@@ -231,7 +257,9 @@ TEST(UvAsyncFunction, VoidWaitFor) {

  loop->Run();

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 }  // namespace uv
--- a/wpiutil/src/test/native/cpp/uv/UvAsyncTest.cpp
+++ b/wpiutil/src/test/native/cpp/uv/UvAsyncTest.cpp
@@ -56,7 +56,9 @@ TEST(UvAsync, Test) {
  prepare->error.connect([](Error) { FAIL(); });
  prepare->closed.connect([&] { close_cb_called++; });
  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      for (;;) {
        mutex.lock();
@@ -95,7 +97,9 @@ TEST(UvAsync, Test) {
  ASSERT_EQ(async_cb_called, 3);
  ASSERT_EQ(close_cb_called, 2);

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsync, Data) {
@@ -113,7 +117,9 @@ TEST(UvAsync, Data) {

  prepare->error.connect([](Error) { FAIL(); });
  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] {
      async->Send(0, [&](int v) {
        ASSERT_EQ(v, 0);
@@ -139,7 +145,9 @@ TEST(UvAsync, Data) {
  ASSERT_EQ(async_cb_called[1], 1);
  ASSERT_EQ(close_cb_called, 1);

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 TEST(UvAsync, DataRef) {
@@ -153,7 +161,9 @@ TEST(UvAsync, DataRef) {
  auto prepare = Prepare::Create(loop);

  prepare->prepare.connect([&] {
-    if (prepare_cb_called++) return;
+    if (prepare_cb_called++) {
+      return;
+    }
    theThread = std::thread([&] { async->Send(1, val); });
  });
  prepare->Start();
@@ -168,7 +178,9 @@ TEST(UvAsync, DataRef) {

  ASSERT_EQ(val, 1);

-  if (theThread.joinable()) theThread.join();
+  if (theThread.joinable()) {
+    theThread.join();
+  }
 }

 }  // namespace uv
--- a/wpiutil/src/test/native/cpp/uv/UvLoopWalkTest.cpp
+++ b/wpiutil/src/test/native/cpp/uv/UvLoopWalkTest.cpp
@@ -44,7 +44,9 @@ TEST(UvLoop, Walk) {

  timer->timeout.connect([&, theTimer = timer.get()] {
    theTimer->GetLoopRef().Walk([&](Handle& it) {
-      if (&it == timer.get()) seen_timer_handle++;
+      if (&it == timer.get()) {
+        seen_timer_handle++;
+      }
    });
    theTimer->Close();
  });
@@ -58,7 +60,9 @@ TEST(UvLoop, Walk) {
  // Loop is finished, should not see our timer handle
  seen_timer_handle = 0;
  loop->Walk([&](Handle& it) {
-    if (&it == timer.get()) seen_timer_handle++;
+    if (&it == timer.get()) {
+      seen_timer_handle++;
+    }
  });
  ASSERT_EQ(seen_timer_handle, 0);
 }