Reformat code to comply with clang-format 18

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

4 files changed, 8 insertions, 4 deletions

diff --git a/test/utils/cpp/file_locking.test.cpp b/test/utils/cpp/file_locking.test.cpp
index 50b4fe63..b5e38a9c 100644
--- a/test/utils/cpp/file_locking.test.cpp
+++ b/test/utils/cpp/file_locking.test.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/utils/cpp/file_locking.hpp"
+
 #include <atomic>
 #include <chrono>
 #include <cstdlib>
@@ -23,7 +25,6 @@
 #include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/utils/cpp/atomic.hpp"
-#include "src/utils/cpp/file_locking.hpp"
 
 namespace {
 [[nodiscard]] auto GetTestDir() noexcept -> std::filesystem::path {
diff --git a/test/utils/cpp/path.test.cpp b/test/utils/cpp/path.test.cpp
index 7a0ac1fe..ecfc64c1 100644
--- a/test/utils/cpp/path.test.cpp
+++ b/test/utils/cpp/path.test.cpp
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/utils/cpp/path.hpp"
+
 #include <filesystem>
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/utils/cpp/path.hpp"
 
 TEST_CASE("normalization", "[path]") {
     CHECK(ToNormalPath(std::filesystem::path{""}) ==
diff --git a/test/utils/cpp/path_rebase.test.cpp b/test/utils/cpp/path_rebase.test.cpp
index 79a13fb5..fe62e0be 100644
--- a/test/utils/cpp/path_rebase.test.cpp
+++ b/test/utils/cpp/path_rebase.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/utils/cpp/path_rebase.hpp"
 
+#include "catch2/catch_test_macros.hpp"
+
 TEST_CASE("rebase", "[path_rebase]") {
     CHECK(RebasePathStringRelativeTo("work", "work/foo/bar") == "foo/bar");
     CHECK(RebasePathStringRelativeTo("work", "work/foo") == "foo");
diff --git a/test/utils/cpp/prefix.test.cpp b/test/utils/cpp/prefix.test.cpp
index 3dd092eb..ae47c93d 100644
--- a/test/utils/cpp/prefix.test.cpp
+++ b/test/utils/cpp/prefix.test.cpp
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "src/utils/cpp/prefix.hpp"
+
 #include <filesystem>
 
 #include "catch2/catch_test_macros.hpp"
-#include "src/utils/cpp/prefix.hpp"
 
 TEST_CASE("lines", "[prefix]") {
     CHECK(PrefixLines("").empty());