Reformat code to comply with clang-format 18

... while keeping our .clang-format file.

11 files changed, 35 insertions, 23 deletions

diff --git a/test/buildtool/build_engine/base_maps/directory_map.test.cpp b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
index d001f50e..b59c4ff0 100644
--- a/test/buildtool/build_engine/base_maps/directory_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/base_maps/directory_map.hpp"
+
 #include <filesystem>
 #include <memory>
 #include <string>
 #include <utility>  // std::move
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/build_engine/base_maps/directory_map.hpp"
 #include "src/buildtool/build_engine/base_maps/module_name.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
diff --git a/test/buildtool/build_engine/base_maps/entity_name.test.cpp b/test/buildtool/build_engine/base_maps/entity_name.test.cpp
index 223de0fc..be88f017 100644
--- a/test/buildtool/build_engine/base_maps/entity_name.test.cpp
+++ b/test/buildtool/build_engine/base_maps/entity_name.test.cpp
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name.hpp"
 
+#include "catch2/catch_test_macros.hpp"
+
 TEST_CASE("Normal module names") {
     using NT = BuildMaps::Base::NamedTarget;
     CHECK(NT::normal_module_name("foo/bar") == "foo/bar");
diff --git a/test/buildtool/build_engine/base_maps/expression_map.test.cpp b/test/buildtool/build_engine/base_maps/expression_map.test.cpp
index 21cf1e50..04d5b86e 100644
--- a/test/buildtool/build_engine/base_maps/expression_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/expression_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/base_maps/expression_map.hpp"
+
 #include <filesystem>
 #include <functional>
 #include <memory>
@@ -20,7 +22,6 @@
 
 #include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
-#include "src/buildtool/build_engine/base_maps/expression_map.hpp"
 #include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 #include "src/buildtool/common/repository_config.hpp"
diff --git a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
index 91e74877..be657cff 100644
--- a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
+
 #include <filesystem>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
@@ -28,8 +29,8 @@ namespace {
 
 using namespace BuildMaps::Base;  // NOLINT
 
-auto SetupConfig(std::string target_file_name, bool use_git)
-    -> RepositoryConfig {
+auto SetupConfig(std::string target_file_name,
+                 bool use_git) -> RepositoryConfig {
     auto root = FileRoot{kBasePath};
     if (use_git) {
         auto repo_path = CreateTestRepo();
diff --git a/test/buildtool/build_engine/base_maps/rule_map.test.cpp b/test/buildtool/build_engine/base_maps/rule_map.test.cpp
index 97e9c06d..87a76c2b 100644
--- a/test/buildtool/build_engine/base_maps/rule_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/rule_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/base_maps/rule_map.hpp"
+
 #include <filesystem>
 #include <functional>
 #include <memory>
@@ -22,7 +24,6 @@
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
 #include "src/buildtool/build_engine/base_maps/expression_map.hpp"
 #include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
-#include "src/buildtool/build_engine/base_maps/rule_map.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 #include "src/buildtool/common/repository_config.hpp"
diff --git a/test/buildtool/build_engine/base_maps/source_map.test.cpp b/test/buildtool/build_engine/base_maps/source_map.test.cpp
index 36a58895..44c6863a 100644
--- a/test/buildtool/build_engine/base_maps/source_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/source_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/base_maps/source_map.hpp"
+
 #include <filesystem>
 #include <memory>
 #include <optional>
@@ -23,7 +25,6 @@
 #include "src/buildtool/build_engine/base_maps/directory_map.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
-#include "src/buildtool/build_engine/base_maps/source_map.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
@@ -56,12 +57,11 @@ auto SetupConfig(bool use_git) -> RepositoryConfig {
     return repo_config;
 }
 
-auto ReadSourceTarget(
-    EntityName const& id,
-    SourceTargetMap::Consumer consumer,
-    bool use_git = false,
-    std::optional<SourceTargetMap::FailureFunction> fail_func = std::nullopt)
-    -> bool {
+auto ReadSourceTarget(EntityName const& id,
+                      SourceTargetMap::Consumer consumer,
+                      bool use_git = false,
+                      std::optional<SourceTargetMap::FailureFunction>
+                          fail_func = std::nullopt) -> bool {
     auto repo_config = SetupConfig(use_git);
     auto directory_entries = CreateDirectoryEntriesMap(&repo_config);
     auto source_artifacts =
diff --git a/test/buildtool/build_engine/expression/configuration.test.cpp b/test/buildtool/build_engine/expression/configuration.test.cpp
index 7f54748d..0a902c73 100644
--- a/test/buildtool/build_engine/expression/configuration.test.cpp
+++ b/test/buildtool/build_engine/expression/configuration.test.cpp
@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/expression/configuration.hpp"
+
 #include <string>
 #include <vector>
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 #include "test/utils/container_matchers.hpp"
 
diff --git a/test/buildtool/build_engine/expression/expression.test.cpp b/test/buildtool/build_engine/expression/expression.test.cpp
index 83d6a2fe..aaca1c71 100644
--- a/test/buildtool/build_engine/expression/expression.test.cpp
+++ b/test/buildtool/build_engine/expression/expression.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/expression/expression.hpp"
+
 #include <filesystem>
 #include <sstream>
 #include <string>
@@ -20,7 +22,6 @@
 #include "catch2/catch_test_macros.hpp"
 #include "catch2/matchers/catch_matchers_all.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
-#include "src/buildtool/build_engine/expression/expression.hpp"
 #include "src/buildtool/build_engine/expression/function_map.hpp"
 #include "src/buildtool/common/artifact_description.hpp"
 #include "test/utils/container_matchers.hpp"
@@ -291,8 +292,9 @@ concept ValidExpressionTypeOrPtr =
     Expression::IsValidType<T>() or std::is_same_v<T, ExpressionPtr>;
 
 template <ValidExpressionTypeOrPtr T>
-auto Add(ExpressionPtr const& expr, std::string const& key, T const& by)
-    -> ExpressionPtr {
+auto Add(ExpressionPtr const& expr,
+         std::string const& key,
+         T const& by) -> ExpressionPtr {
     try {
         auto new_map = Expression::map_t::underlying_map_t{};
         new_map.emplace(key, by);
@@ -303,8 +305,9 @@ auto Add(ExpressionPtr const& expr, std::string const& key, T const& by)
 }
 
 template <ValidExpressionTypeOrPtr T>
-auto Replace(ExpressionPtr const& expr, std::string const& key, T const& by)
-    -> ExpressionPtr {
+auto Replace(ExpressionPtr const& expr,
+             std::string const& key,
+             T const& by) -> ExpressionPtr {
     auto const& map = expr->Map();
     if (not map.contains(key)) {
         return ExpressionPtr{nullptr};
diff --git a/test/buildtool/build_engine/expression/linked_map.test.cpp b/test/buildtool/build_engine/expression/linked_map.test.cpp
index 4c9a996f..4d0bf993 100644
--- a/test/buildtool/build_engine/expression/linked_map.test.cpp
+++ b/test/buildtool/build_engine/expression/linked_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/expression/linked_map.hpp"
+
 #include <algorithm>
 #include <cstddef>
 #include <memory>
@@ -19,7 +21,6 @@
 #include <utility>  // std::move
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/buildtool/build_engine/expression/linked_map.hpp"
 #include "test/utils/container_matchers.hpp"
 
 TEST_CASE("Empty map", "[linked_map]") {
diff --git a/test/buildtool/build_engine/target_map/result_map.test.cpp b/test/buildtool/build_engine/target_map/result_map.test.cpp
index 56fbfbd6..c781d83c 100644
--- a/test/buildtool/build_engine/target_map/result_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/result_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/target_map/result_map.hpp"
+
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
@@ -23,7 +25,6 @@
 #include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp"
 #include "src/buildtool/build_engine/expression/target_result.hpp"
-#include "src/buildtool/build_engine/target_map/result_map.hpp"
 #include "src/buildtool/common/action_description.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp
index 85d3b104..cb8aa230 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/buildtool/build_engine/target_map/target_map.hpp"
+
 #include <filesystem>
 #include <string>
 #include <utility>  // std::move
@@ -25,7 +27,6 @@
 #include "src/buildtool/build_engine/base_maps/source_map.hpp"
 #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
-#include "src/buildtool/build_engine/target_map/target_map.hpp"
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"