Merge pull request #36957 from vespa-engine/arnej/rerun-format-4

re-run clang-format

Author: arnej27959

searchcore/src/tests/proton/matching/matching_test.cpp

@@ -189,10 +189,10 @@ std::string make_same_element_stack_dump(const std::string& a1_term, const std::
 
 std::string make_near_stack_dump(bool ordered, const std::string& term1, const std::string& term2) {
     QueryBuilder<ProtonNodeTypes> builder;
-    constexpr int child_count = 2;
-    constexpr size_t distance = 10;
-    constexpr size_t num_negative_children = 0;
-    constexpr size_t exclusion_distance = 0;
+    constexpr int                 child_count = 2;
+    constexpr size_t              distance = 10;
+    constexpr size_t              num_negative_children = 0;
+    constexpr size_t              exclusion_distance = 0;
     if (ordered) {
         builder.addONear(child_count, distance, num_negative_children, exclusion_distance);
     } else {

vespalib/src/tests/util/deadline_test.cpp

@@ -14,11 +14,9 @@ class DeadlineTest : public ::testing::Test {
 public:
     DeadlineTest();
     ~DeadlineTest() override;
-
 };
 
-DeadlineTest::DeadlineTest()
-    : time(vespalib::steady_clock::now()) {
+DeadlineTest::DeadlineTest() : time(vespalib::steady_clock::now()) {
 }
 
 DeadlineTest::~DeadlineTest() = default;

vespalib/src/vespa/vespalib/util/deadline.cpp

@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "deadline.h"
+
 #include "fake_deadline.h"
 
 namespace vespalib {
@@ -14,4 +15,4 @@ const Deadline& Deadline::never() noexcept {
     return never_missed.get_deadline();
 }
 
-}
+} // namespace vespalib

vespalib/src/vespa/vespalib/util/deadline.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "time.h"
+
 #include <atomic>
 
 namespace vespalib {
@@ -30,7 +31,10 @@ class Deadline {
     /**
      * Returns whether the deadline is missed, i.e., whether the current time is after the deadline's time point.
      */
-    [[nodiscard]] bool is_missed() const noexcept { _missed = _missed || (get_time_ns() > _deadline); return _missed; }
+    [[nodiscard]] bool is_missed() const noexcept {
+        _missed = _missed || (get_time_ns() > _deadline);
+        return _missed;
+    }
     /**
      * Returns whether the deadline was missed, i.e., is_missed() was called after the deadline.
      */
@@ -51,4 +55,4 @@ class Deadline {
     mutable bool                    _missed;
 };
 
-}
+} // namespace vespalib

vespalib/src/vespa/vespalib/util/doom.cpp

@@ -3,16 +3,14 @@
 #include "doom.h"
 
 #include "fake_doom.h"
+
 #include <cassert>
 
 namespace vespalib {
 
 Doom::Doom(const std::atomic<steady_time>& now_ref, steady_time soft_doom, steady_time hard_doom,
            bool explicit_soft_doom) noexcept
-    : _now(now_ref),
-      _softDoom(soft_doom),
-      _hardDoom(hard_doom),
-      _isExplicitSoftDoom(explicit_soft_doom) {
+    : _now(now_ref), _softDoom(soft_doom), _hardDoom(hard_doom), _isExplicitSoftDoom(explicit_soft_doom) {
 }
 
 Deadline Doom::make_deadline(steady_time point_of_deadline, Deadline::Type type) const noexcept {

vespalib/src/vespa/vespalib/util/doom.h

@@ -4,6 +4,7 @@
 
 #include "deadline.h"
 #include "time.h"
+
 #include <atomic>
 
 namespace vespalib {

vespalib/src/vespa/vespalib/util/fake_deadline.cpp

@@ -4,17 +4,15 @@
 
 namespace vespalib {
 
-FakeDeadline::FakeDeadline() noexcept
-    : FakeDeadline(1s) {
+FakeDeadline::FakeDeadline() noexcept : FakeDeadline(1s) {
 }
 
 FakeDeadline::FakeDeadline(steady_time::duration time_to_deadline) noexcept
     : FakeDeadline(time_to_deadline, Deadline::Type::BUDGET) {
 }
 
 FakeDeadline::FakeDeadline(steady_time::duration time_to_deadline, Deadline::Type type) noexcept
-    : _time(steady_clock::now()),
-      _deadline(_time, _time.load(std::memory_order_relaxed) + time_to_deadline, type) {
+    : _time(steady_clock::now()), _deadline(_time, _time.load(std::memory_order_relaxed) + time_to_deadline, type) {
 }
 
 FakeDeadline::~FakeDeadline() = default;

vespalib/src/vespa/vespalib/util/fake_doom.cpp

@@ -5,8 +5,7 @@
 namespace vespalib {
 
 FakeDoom::FakeDoom(steady_time::duration time_to_doom) noexcept
-    : _time(steady_clock::now()),
-      _doom(_time, _time.load(std::memory_order_relaxed) + time_to_doom) {
+    : _time(steady_clock::now()), _doom(_time, _time.load(std::memory_order_relaxed) + time_to_doom) {
 }
 
 FakeDoom::~FakeDoom() = default;