From 83f03b1b4ab60846226a859b432e5ed9cffb7c26 Mon Sep 17 00:00:00 2001
From: dragonmux <git@dragonmux.network>
Date: Wed, 7 Jun 2023 03:45:16 +0100
Subject: [PATCH] test/affinity: Made use of more brace initialisation in the
 suite

---
 test/affinity.cxx | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/test/affinity.cxx b/test/affinity.cxx
index ff219df9..2cde5232 100644
--- a/test/affinity.cxx
+++ b/test/affinity.cxx
@@ -158,16 +158,19 @@ TEST_CASE("pinning", "[affinity_t]")
 #if defined(_POSIX_THREADS) && !defined(__WINPTHREADS_VERSION)
 	for (const auto &processor : *affinity)
 	{
-		const auto result = std::async(std::launch::async,
-			[&](const uint32_t currentProcessor) noexcept -> int32_t
-			{
-				try
-					{ affinity->pinThreadTo(currentProcessor); }
-				catch (const std::out_of_range &)
-					{ return INT32_MAX; }
-				return sched_getcpu();
-			}, processor
-		).get();
+		const auto result
+		{
+			std::async(std::launch::async,
+				[&](const uint32_t currentProcessor) noexcept -> int32_t
+				{
+					try
+						{ affinity->pinThreadTo(currentProcessor); }
+					catch (const std::out_of_range &)
+						{ return INT32_MAX; }
+					return sched_getcpu();
+				}, processor
+			).get()
+		};
 		REQUIRE(result != -1);
 		REQUIRE(result == static_cast<int32_t>(processor));
 	}
@@ -175,15 +178,18 @@ TEST_CASE("pinning", "[affinity_t]")
 	uint32_t count{0};
 	for (const auto &processor : *affinity)
 	{
-		const auto result = std::async(std::launch::async,
-			[&](const uint32_t currentProcessor) -> GROUP_AFFINITY
-			{
-				affinity->pinThreadTo(currentProcessor);
-				GROUP_AFFINITY res{};
-				REQUIRE(GetThreadGroupAffinity(GetCurrentThread(), &res));
-				return res;
-			}, count++
-		).get();
+		const auto result
+		{
+			std::async(std::launch::async,
+				[&](const uint32_t currentProcessor) -> GROUP_AFFINITY
+				{
+					affinity->pinThreadTo(currentProcessor);
+					GROUP_AFFINITY res{};
+					REQUIRE(GetThreadGroupAffinity(GetCurrentThread(), &res));
+					return res;
+				}, count++
+			).get()
+		};
 		REQUIRE(result.Mask == UINT64_C(1) << processor.second);
 		REQUIRE(result.Group == processor.first);
 	}
@@ -344,7 +350,7 @@ TEST_CASE("pin second core", "[affinity_t]")
 			return UINT32_MAX;
 		}()
 	};
-	const std::initializer_list<uint32_t> processorList {uint32_t(processor)};
+	const std::initializer_list<uint32_t> processorList{uint32_t(processor)};
 
 	REQUIRE(processor != UINT32_MAX);
 	auto affinity{substrate::make_unique_nothrow<substrate::affinity_t>(0U, processorList)};