Merge pull request #432

zeek · Nov 7, 2024 · 6bdc5c7 · 6bdc5c7
2 parents 6d9917b + 83d9a08
commit 6bdc5c7
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 27 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,6 +3,6 @@
 #
 repos:
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: 'v18.1.8'
+  rev: 'v19.1.3'
   hooks:
   - id: clang-format
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.8.0-dev.137 | 2024-11-07 19:06:35 +0100
+
+  * Update `clang-format` on CI (Dominik Charousset)
+
 2.8.0-dev.135 | 2024-11-07 16:48:29 +0100
 
   * Bump dockerfiles for Fedora 39 and 40 (Dominik Charousset)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.0-dev.135
+2.8.0-dev.137
diff --git a/bindings/python/_broker.cpp b/bindings/python/_broker.cpp
@@ -272,8 +272,8 @@ PYBIND11_MODULE(_broker, m) {
                                                           "StatusSubscriber");
   status_subscriber
     .def("get",
-         (broker::status_subscriber::value_type(broker::status_subscriber::*)())
-           & broker::status_subscriber::get)
+         (broker::status_subscriber::value_type(
+           broker::status_subscriber::*)()) &broker::status_subscriber::get)
     .def("get",
          [](broker::status_subscriber& ep, double secs)
            -> std::optional<broker::status_subscriber::value_type> {

diff --git a/libbroker/broker/alm/multipath.hh b/libbroker/broker/alm/multipath.hh
@@ -68,14 +68,14 @@ private:
 };
 
 template <class T, class U>
-auto operator==(node_iterator<T> x,
-                node_iterator<U> y) -> decltype(x.get() == y.get()) {
+auto operator==(node_iterator<T> x, node_iterator<U> y)
+  -> decltype(x.get() == y.get()) {
   return x.get() == y.get();
 }
 
 template <class T, class U>
-auto operator!=(node_iterator<T> x,
-                node_iterator<U> y) -> decltype(x.get() != y.get()) {
+auto operator!=(node_iterator<T> x, node_iterator<U> y)
+  -> decltype(x.get() != y.get()) {
   return x.get() != y.get();
 }
 

diff --git a/libbroker/broker/detail/type_traits.hh b/libbroker/broker/detail/type_traits.hh
@@ -139,8 +139,8 @@ inline constexpr bool are_same_v = are_same<Ts...>::value;
 template <class From, class To>
 struct has_convert {
   template <class T>
-  static auto test(const T* x) -> decltype(convert(*x, std::declval<To&>()),
-                                           std::true_type());
+  static auto test(const T* x)
+    -> decltype(convert(*x, std::declval<To&>()), std::true_type());
 
   template <class T>
   static auto test(...) -> std::false_type;
@@ -264,9 +264,9 @@ inline constexpr bool is_tuple = is_tuple_oracle<T>::value;
   class has_encode_overload {                                                  \
   private:                                                                     \
     template <class U>                                                         \
-    static auto                                                                \
-    sfinae(U& y) -> decltype(::ns_name::encode(y, std::declval<OutIter&>()),   \
-                             std::true_type{});                                \
+    static auto sfinae(U& y)                                                   \
+      -> decltype(::ns_name::encode(y, std::declval<OutIter&>()),              \
+                  std::true_type{});                                           \
     static std::false_type sfinae(...);                                        \
     using result_type = decltype(sfinae(std::declval<T&>()));                  \
                                                                                \
@@ -282,9 +282,9 @@ inline constexpr bool is_tuple = is_tuple_oracle<T>::value;
   class has_decode_overload {                                                  \
   private:                                                                     \
     template <class U>                                                         \
-    static auto                                                                \
-    sfinae(U& y) -> decltype(::ns_name::decode(y, std::declval<OutIter&>()),   \
-                             std::true_type{});                                \
+    static auto sfinae(U& y)                                                   \
+      -> decltype(::ns_name::decode(y, std::declval<OutIter&>()),              \
+                  std::true_type{});                                           \
     static std::false_type sfinae(...);                                        \
     using result_type = decltype(sfinae(std::declval<T&>()));                  \
                                                                                \

diff --git a/libbroker/broker/expected.hh b/libbroker/broker/expected.hh
@@ -246,8 +246,8 @@ private:
 
 /// @relates expected
 template <class T>
-auto operator==(const expected<T>& x,
-                const expected<T>& y) -> decltype(*x == *y) {
+auto operator==(const expected<T>& x, const expected<T>& y)
+  -> decltype(*x == *y) {
   return x && y ? *x == *y : (!x && !y ? x.error() == y.error() : false);
 }
 
@@ -290,8 +290,8 @@ bool operator==(ec x, const expected<T>& y) {
 
 /// @relates expected
 template <class T>
-auto operator!=(const expected<T>& x,
-                const expected<T>& y) -> decltype(*x == *y) {
+auto operator!=(const expected<T>& x, const expected<T>& y)
+  -> decltype(*x == *y) {
   return !(x == y);
 }
 

diff --git a/libbroker/broker/intrusive_ptr.hh b/libbroker/broker/intrusive_ptr.hh
@@ -224,15 +224,15 @@ bool operator!=(const T* x, const intrusive_ptr<T>& y) {
 
 /// @relates intrusive_ptr
 template <class T, class U>
-auto operator==(const intrusive_ptr<T>& x,
-                const intrusive_ptr<U>& y) -> decltype(x.get() == y.get()) {
+auto operator==(const intrusive_ptr<T>& x, const intrusive_ptr<U>& y)
+  -> decltype(x.get() == y.get()) {
   return x.get() == y.get();
 }
 
 /// @relates intrusive_ptr
 template <class T, class U>
-auto operator!=(const intrusive_ptr<T>& x,
-                const intrusive_ptr<U>& y) -> decltype(x.get() != y.get()) {
+auto operator!=(const intrusive_ptr<T>& x, const intrusive_ptr<U>& y)
+  -> decltype(x.get() != y.get()) {
   return x.get() != y.get();
 }
 

diff --git a/tests/benchmarks/routing-table/routing-table.cc b/tests/benchmarks/routing-table/routing-table.cc
@@ -208,9 +208,9 @@ class routing_table : public benchmark::Fixture {
     };
     for (size_t index = 0; index < 10; ++index)
       fill_tbl(topologies[index], g, {}, 0, index, on_new_node);
-      // for (size_t index = 0; index < 10; ++index)
-      //   fill_tbl(v2_topologies[index], g, {}, 0, index, [](auto&&...) {});
-      // Sanity checking
+    // for (size_t index = 0; index < 10; ++index)
+    //   fill_tbl(v2_topologies[index], g, {}, 0, index, [](auto&&...) {});
+    // Sanity checking
 #ifndef NDEBUG
     for (size_t index = 0; index < 10; ++index)
       assert(ids[index].size() == (1 << (index + 1)));