Reformat... solves bad formatting from clang-format-17

helly25 · Feb 22, 2025 · 10d28f7 · 10d28f7
1 parent 7bb5d0d
commit 10d28f7
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 48 deletions.
diff --git a/mbo/container/any_scan.h b/mbo/container/any_scan.h
@@ -355,18 +355,18 @@ class AnyScanImpl {
   requires(kAccessByRef)
   explicit AnyScanImpl(MakeAnyScanData<Container, kScanMode> data)
       : funcs_{
-          .iter =
-              [data = data] {
-                auto pos = MakeSharedIterator(data.container());
-                return IterFuncs{
-                    .more = [data = data, pos = pos]() -> bool { return *pos != data.container().end(); },
-                    .curr = [&it = *pos]() -> AccessType { return *it; },
-                    .next = [&it = *pos] { ++it; },
-                };
-              },
-          .empty = [data = data] { return data.empty(); },
-          .size = [data = data] { return data.size(); },
-      } {}
+            .iter =
+                [data = data] {
+                  auto pos = MakeSharedIterator(data.container());
+                  return IterFuncs{
+                      .more = [data = data, pos = pos]() -> bool { return *pos != data.container().end(); },
+                      .curr = [&it = *pos]() -> AccessType { return *it; },
+                      .next = [&it = *pos] { ++it; },
+                  };
+                },
+            .empty = [data = data] { return data.empty(); },
+            .size = [data = data] { return data.size(); },
+        } {}
 
   // For MakConvertingScan
   template<AcceptableContainer Container>
@@ -376,19 +376,19 @@ class AnyScanImpl {
       && std::constructible_from<value_type, AccessType>)
   explicit AnyScanImpl(MakeAnyScanData<Container, kScanMode> data)
       : funcs_{
-          // NOTE: data must be copied here!
-          .iter =
-              [data = data] {
-                auto pos = MakeSharedIterator(data.container());
-                return IterFuncs{
-                    .more = [data = data, pos = pos]() -> bool { return *pos != data.container().end(); },
-                    .curr = [&it = *pos]() -> AccessType { return AccessType(*it); },
-                    .next = [&it = *pos] { ++it; },
-                };
-              },
-          .empty = [data = data] { return data.empty(); },
-          .size = [data = data] { return data.size(); },
-      } {}
+            // NOTE: data must be copied here!
+            .iter =
+                [data = data] {
+                  auto pos = MakeSharedIterator(data.container());
+                  return IterFuncs{
+                      .more = [data = data, pos = pos]() -> bool { return *pos != data.container().end(); },
+                      .curr = [&it = *pos]() -> AccessType { return AccessType(*it); },
+                      .next = [&it = *pos] { ++it; },
+                  };
+                },
+            .empty = [data = data] { return data.empty(); },
+            .size = [data = data] { return data.size(); },
+        } {}
 
   // NOLINTEND(bugprone-forwarding-reference-overload)
 
@@ -405,10 +405,10 @@ class AnyScanImpl {
 
     iterator_impl()
         : funcs_{
-            .more = [] { return false; },
-            .curr = nullptr,
-            .next = [] {},
-        } {}
+              .more = [] { return false; },
+              .curr = nullptr,
+              .next = [] {},
+          } {}
 
     explicit iterator_impl(const AccessFuncs& funcs) : funcs_(funcs.iter()) {}
 
@@ -510,8 +510,8 @@ class AnyScan : public container_internal::AnyScanImpl<ValueType, DifferenceType
  public:
   AnyScan(const std::initializer_list<ValueType>& data)
       : AnyScanImpl(
-          container_internal::MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kAny>(
-              data)) {}
+            container_internal::MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kAny>(
+                data)) {}
 
   template<::mbo::types::ContainerHasInputIterator Container>
   requires(std::constructible_from<ValueType, typename std::remove_cvref_t<Container>::value_type>)
@@ -533,8 +533,8 @@ class ConstScan
  public:
   ConstScan(const std::initializer_list<ValueType>& data)
       : AnyScanImpl(
-          container_internal::MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kConst>(
-              data)) {}
+            container_internal::MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kConst>(
+                data)) {}
 
   template<container_internal::AcceptableContainer Container>
   requires(std::constructible_from<const ValueType, typename std::remove_cvref_t<Container>::value_type>)
@@ -556,8 +556,8 @@ class ConvertingScan
  public:
   ConvertingScan(const std::initializer_list<ValueType>& data)
       : AnyScanImpl(
-          container_internal::
-              MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kConverting>(data)) {}
+            container_internal::
+                MakeAnyScanData<std::initializer_list<ValueType>, container_internal::ScanMode::kConverting>(data)) {}
 
   template<container_internal::AcceptableContainer Container>
   requires(std::constructible_from<ValueType, typename std::remove_cvref_t<Container>::value_type>)

diff --git a/mbo/container/internal/limited_ordered.h b/mbo/container/internal/limited_ordered.h
@@ -99,9 +99,10 @@ class [[nodiscard]] LimitedOrdered {
     constexpr ~Data() noexcept
     requires(std::is_trivially_destructible_v<Value>)
     = default;
+
     ~Data() noexcept
     requires(!std::is_trivially_destructible_v<Value>)
-    {};
+    {}
 
     Value data;
     None none;
@@ -378,7 +379,8 @@ class [[nodiscard]] LimitedOrdered {
   }
 
   constexpr LimitedOrdered() noexcept = default;
-  constexpr explicit LimitedOrdered(const Compare& key_comp) noexcept : key_comp_(key_comp){};
+
+  constexpr explicit LimitedOrdered(const Compare& key_comp) noexcept : key_comp_(key_comp) {}
 
   constexpr LimitedOrdered(const LimitedOrdered& other) noexcept {
     for (; size_ < other.size_; ++size_) {

diff --git a/mbo/container/limited_map.h b/mbo/container/limited_map.h
@@ -79,7 +79,7 @@ class LimitedMap final
 
   constexpr LimitedMap() noexcept = default;
 
-  constexpr explicit LimitedMap(const KeyComp& key_comp) noexcept : LimitedBase(key_comp){};
+  constexpr explicit LimitedMap(const KeyComp& key_comp) noexcept : LimitedBase(key_comp) {}
 
   constexpr LimitedMap(const LimitedMap& other) noexcept : LimitedBase(other) {}
 

diff --git a/mbo/container/limited_set.h b/mbo/container/limited_set.h
@@ -69,7 +69,7 @@ class LimitedSet final : public container_internal::LimitedOrdered<Key, Key, Key
 
   constexpr ~LimitedSet() noexcept = default;
 
-  constexpr explicit LimitedSet(const Compare& key_comp) noexcept : LimitedBase(key_comp){};
+  constexpr explicit LimitedSet(const Compare& key_comp) noexcept : LimitedBase(key_comp) {}
 
   constexpr LimitedSet(const LimitedSet& other) noexcept : LimitedBase(other) {}
 

diff --git a/mbo/container/limited_vector.h b/mbo/container/limited_vector.h
@@ -85,7 +85,7 @@ class LimitedVector final {
 
     constexpr ~Data() noexcept
     requires(!std::is_trivially_destructible_v<T>)
-    {};
+    {}
 
     None none;
     T data;

diff --git a/mbo/strings/split.h b/mbo/strings/split.h
@@ -24,7 +24,7 @@ namespace mbo::strings {
 // Modifier for `absl::StrSplit` that creates at most two parts separated by 'sep'.
 class AtLast {
  public:
-  explicit AtLast(char sep) : sep_(sep){};
+  explicit AtLast(char sep) : sep_(sep) {}
 
   std::string_view Find(std::string_view text, std::size_t pos) const {
     std::size_t next_pos = text.substr(pos).rfind(sep_);

diff --git a/mbo/types/template_search_test.cc b/mbo/types/template_search_test.cc
@@ -42,10 +42,12 @@ struct IsNonZero {
 
 template<
     std::size_t Expected,
-    template<template<std::size_t> typename, std::size_t Start, std::size_t End, std::size_t NotFound>
-    typename Algorithm,
-    template<typename>
-    typename TestFunc,
+    template<
+        template<std::size_t> typename,
+        std::size_t Start,
+        std::size_t End,
+        std::size_t NotFound> typename Algorithm,
+    template<typename> typename TestFunc,
     typename TestType,
     std::size_t Start = 0,
     std::size_t End = TestType::size(),

diff --git a/mbo/types/traits_test.cc b/mbo/types/traits_test.cc
@@ -81,7 +81,7 @@ struct CtorDefault {
 };
 
 struct CtorUser {
-  CtorUser(){};  // NOLINT(*-use-equals-default)
+  CtorUser() {}  // NOLINT(*-use-equals-default)
 };
 
 struct CtorBase : CtorUser {};

diff --git a/mbo/types/tstring.h b/mbo/types/tstring.h
@@ -457,8 +457,8 @@ struct MakeTstringLiteralHelper {
   // NOLINTBEGIN(google-explicit-constructor)
   constexpr MakeTstringLiteralHelper(const char (&str)[N]) noexcept
       : MakeTstringLiteralHelper(
-          std::string_view{str, Length(N)},
-          std::make_integer_sequence<std::size_t, Length(N)>()) {}
+            std::string_view{str, Length(N)},
+            std::make_integer_sequence<std::size_t, Length(N)>()) {}
 
   // NOLINTEND(google-explicit-constructor)
   // NOLINTEND(*-avoid-c-arrays)
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,7 @@ class LimitedVector final { @@
         constexpr ~Data() noexcept
         requires(!std::is_trivially_destructible_v<T>)
-        {};
+        {}
         None none;
         T data;
@@ Expand Down @@