Support clang 18 (#801)

* Bump fmt * Update other files * Fix fmt::join error
cmu-db · Jan 26, 2025 · 45bdaaf · 45bdaaf
1 parent 3e93325
commit 45bdaaf
Show file tree

Hide file tree

Showing 221 changed files with 20,196 additions and 46,351 deletions.
diff --git a/src/common/util/string_util.cpp b/src/common/util/string_util.cpp
@@ -21,6 +21,7 @@
 
 #include "common/util/string_util.h"
 #include "fmt/format.h"
+#include "fmt/ranges.h"
 
 namespace bustub {
 

diff --git a/src/include/binder/expressions/bound_column_ref.h b/src/include/binder/expressions/bound_column_ref.h
@@ -21,6 +21,7 @@
 
 #include "binder/bound_expression.h"
 #include "common/macros.h"
+#include "fmt/ranges.h"
 
 namespace bustub {
 

diff --git a/src/include/execution/expressions/array_expression.h b/src/include/execution/expressions/array_expression.h
@@ -18,6 +18,7 @@
 
 #include "common/exception.h"
 #include "execution/expressions/abstract_expression.h"
+#include "fmt/ranges.h"
 #include "type/value_factory.h"
 
 namespace bustub {

diff --git a/src/primer/orset.cpp b/src/primer/orset.cpp
@@ -16,6 +16,7 @@
 #include <vector>
 #include "common/exception.h"
 #include "fmt/format.h"
+#include "fmt/ranges.h"
 
 namespace bustub {
 

diff --git a/src/type/timestamp_type.cpp b/src/type/timestamp_type.cpp
@@ -110,7 +110,7 @@ auto TimestampType::ToString(const Value &val) const -> std::string {
   tm /= 100000;
   auto year = static_cast<uint16_t>(tm % 10000);
   tm /= 10000;
-  auto tz = static_cast<int>(tm % 27);
+  auto tz = static_cast<int8_t>(tm % 27);
   tz -= 12;
   tm /= 27;
   auto day = static_cast<uint16_t>(tm % 32);

diff --git a/src/type/vector_type.cpp b/src/type/vector_type.cpp
@@ -15,6 +15,7 @@
 
 #include "common/exception.h"
 #include "common/macros.h"
+#include "fmt/ranges.h"
 #include "type/type_id.h"
 #include "type/type_util.h"
 #include "type/vector_type.h"

diff --git a/test/txn/txn_common.h b/test/txn/txn_common.h
@@ -39,6 +39,7 @@
 #include "execution/execution_common.h"
 #include "fmt/core.h"
 #include "fmt/format.h"
+#include "fmt/ranges.h"
 #include "gtest/gtest.h"
 #include "storage/disk/disk_manager_memory.h"
 #include "storage/index/b_plus_tree.h"

diff --git a/third_party/fmt/.clang-format b/third_party/fmt/.clang-format
@@ -6,3 +6,9 @@ IndentPPDirectives: AfterHash
 IndentCaseLabels: false
 AlwaysBreakTemplateDeclarations: false
 DerivePointerAlignment: false
+AllowShortCaseLabelsOnASingleLine: true
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+  AlignCaseColons: false