Clang-format lambdas better

ndsev · Sep 3, 2024 · 3e768cf · 3e768cf
1 parent ffbf608
commit 3e768cf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/.clang-format b/.clang-format
@@ -76,7 +76,7 @@ AllowShortEnumsOnASingleLine: false
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
-AllowShortLambdasOnASingleLine: All
+AllowShortLambdasOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None

diff --git a/runtime/src/zserio/HashCodeUtil.h b/runtime/src/zserio/HashCodeUtil.h
@@ -123,13 +123,13 @@ inline typename std::enable_if<std::is_enum<ENUM_TYPE>::value, uint32_t>::type c
 }
 
 /**
-* Calculates hash code of the given Zserio object (structure, choice, ...) using the given seed value.
-*
-* \param seedValue Seed value (current hash code).
-* \param object Object for which to calculate the hash code.
-*
-* \return Calculated hash code.
-*/
+ * Calculates hash code of the given Zserio object (structure, choice, ...) using the given seed value.
+ *
+ * \param seedValue Seed value (current hash code).
+ * \param object Object for which to calculate the hash code.
+ *
+ * \return Calculated hash code.
+ */
 template <typename OBJECT>
 inline typename std::enable_if<!std::is_enum<OBJECT>::value && !std::is_integral<OBJECT>::value, uint32_t>::type
 calcHashCode(uint32_t seedValue, const OBJECT& object)

diff --git a/runtime/src/zserio/Variant.h b/runtime/src/zserio/Variant.h
@@ -688,11 +688,9 @@ uint32_t calcHashCode(uint32_t seed, const BasicVariant<ALLOC, INDEX, T...>& var
 {
     uint32_t result = seed;
     result = zserio::calcHashCode(result, static_cast<size_t>(var.index()));
-    var.visit(
-            [&result](const auto& value)
-            {
-                result = zserio::calcHashCode(result, value);
-            });
+    var.visit([&result](const auto& value) {
+        result = zserio::calcHashCode(result, value);
+    });
     return result;
 }
 

diff --git a/runtime/test/zserio/VariantTest.cpp b/runtime/test/zserio/VariantTest.cpp
@@ -1,10 +1,10 @@
 #include <algorithm>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "zserio/HashCodeUtil.h"
 #include "zserio/TrackingAllocator.h"
 #include "zserio/Variant.h"
-#include <utility>
 
 // helper type for the visitor
 template <class... Ts>
@@ -225,28 +225,23 @@ TYPED_TEST(VariantTest, visit)
     Variant1 var;
     var.emplace<Idx1::B>("something");
 
-    var.visit(
-            [](auto&& val)
-            {
-                using T = std::decay_t<decltype(val)>;
-                ASSERT_TRUE((std::is_same_v<T, std::string>));
-            });
+    var.visit([](auto&& val) {
+        using T = std::decay_t<decltype(val)>;
+        ASSERT_TRUE((std::is_same_v<T, std::string>));
+    });
 
-    var.visit(overloaded{[](std::string& i)
-            {
-                SUCCEED();
-            },
-            [](auto&&)
-            {
+    var.visit(overloaded{[](std::string& i) {
+                             SUCCEED();
+                         },
+            [](auto&&) {
                 FAIL();
             }});
 
-    int ret = var.visit(overloaded{[](std::string& i)
-            {
+    int ret = var.visit(overloaded{
+            [](std::string& i) {
                 return 1;
             },
-            [](auto&&)
-            {
+            [](auto&&) {
                 return 0;
             }});
     ASSERT_EQ(ret, 1);
@@ -302,9 +297,10 @@ namespace std
 template <>
 struct hash<zserio::BigObj>
 {
-    size_t operator()(const zserio::BigObj& ) const {
+    size_t operator()(const zserio::BigObj&) const
+    {
         return 0;
     }
 };
 
-}
+} // namespace std