CI: Use Clang 18 (#132)

* clang-tidy * update fmt * clang 18 * format using clang-format-18 * ??? without default: error: 'switch' missing 'default' label [-Werror,-Wswitch-default] with default: error: default label in switch which covers all enumeration values [-Werror,-Wcovered-switch-default] * we have to disable one of the switch warnings see nlohmann/json#3539 * switch to latest docker-cpp-build
motis-project · Sep 10, 2024 · ada780c · ada780c
1 parent 704210f
commit ada780c
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           find include src test \
             -type f -a \( -name "*.cc" -o -name "*.h" -o -name ".cuh" -o -name ".cu" \) \
-            -print0 | xargs -0 clang-format-17 -i
+            -print0 | xargs -0 clang-format-18 -i
 
       - name: Check for differences
         run: |

diff --git a/.pkg b/.pkg
@@ -21,7 +21,7 @@
 [fmt]
   url=git@github.com:motis-project/fmt.git
   branch=master
-  commit=09e6cf8fa61ff44509595005631f9da5d917ed3f
+  commit=dc10f83be70ac2873d5f8d1ce317596f1fd318a2
 [date]
   url=git@github.com:motis-project/date.git
   branch=master

diff --git a/.pkg.lock b/.pkg.lock
@@ -1,10 +1,10 @@
-8129346325798563128
+14526600618413782245
 cista f52a62c4d83377acd398227ab4fcd6c946bdbd70
 PEGTL 1c1aa6e650e4d26f10fa398f148ec0cdc5f0808d
 res 7d97784ba785ce8a2677ea77164040fde484fb04
 date d84b23ca2432e17f3f04a3e0cc96b096b99c39a2
 googletest 7b64fca6ea0833628d6f86255a81424365f7cc0c
-fmt 09e6cf8fa61ff44509595005631f9da5d917ed3f
+fmt dc10f83be70ac2873d5f8d1ce317596f1fd318a2
 utl 77aac494c45d2b070e65fe712abc34ac74a91d0f
 oh d21c30f40e52a83d6dc09bcffd0067598b5ec069
 zlib fe8e13ffca867612951bc6baf114e5ac8b00f305

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         -Wno-reserved-macro-identifier
         -Wno-documentation-unknown-command
         -Wno-duplicate-enum
+        -Wno-switch-default
         -Werror)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
   set(nigiri-compile-options -Wall -Wextra -Werror)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -66,8 +66,8 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/sanitizer",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang-17",
-        "CMAKE_CXX_COMPILER": "clang++-17",
+        "CMAKE_C_COMPILER": "clang-18",
+        "CMAKE_CXX_COMPILER": "clang++-18",
         "CMAKE_EXE_LINKER_FLAGS": "-lc++abi",
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_FLAGS": "-fsanitize=address,undefined -fno-omit-frame-pointer",
@@ -113,8 +113,8 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/clang-tidy",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang-17",
-        "CMAKE_CXX_COMPILER": "clang++-17",
+        "CMAKE_C_COMPILER": "clang-18",
+        "CMAKE_CXX_COMPILER": "clang++-18",
         "CMAKE_CXX_FLAGS": "-stdlib=libc++",
         "CMAKE_EXE_LINKER_FLAGS": "-lc++abi",
         "CMAKE_BUILD_TYPE": "Release",
@@ -160,4 +160,4 @@
       "configurePreset": "linux-sanitizer"
     }
   ]
-}
+}
diff --git a/cmake/clang-tidy.cmake b/cmake/clang-tidy.cmake
@@ -7,7 +7,7 @@ file(RELATIVE_PATH RELATIVE_SOURCE_DIR ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 if(NIGIRI_CLANG_TIDY_COMMAND)
   set(CLANG_TIDY_COMMAND "${NIGIRI_CLANG_TIDY_COMMAND}")
 else()
-  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy-17)
+  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy-18)
 endif()
 
 if(NOT CLANG_TIDY_COMMAND)

diff --git a/include/nigiri/routing/interval_estimate.h b/include/nigiri/routing/interval_estimate.h
@@ -15,10 +15,9 @@ struct interval_estimator {
       : tt_{tt}, q_{q} {
 
     auto const start_itv = std::visit(
-        utl::overloaded{[](unixtime_t const& ut) {
-                          return interval<unixtime_t>{ut, ut};
-                        },
-                        [](interval<unixtime_t> iut) { return iut; }},
+        utl::overloaded{
+            [](unixtime_t const& ut) { return interval<unixtime_t>{ut, ut}; },
+            [](interval<unixtime_t> iut) { return iut; }},
         q.start_time_);
 
     data_type_max_interval_ = {

diff --git a/include/nigiri/routing/search.h b/include/nigiri/routing/search.h
@@ -147,13 +147,13 @@ struct search {
         state_{s},
         q_{std::move(q)},
         search_interval_{std::visit(
-            utl::overloaded{
-                [](interval<unixtime_t> const start_interval) {
-                  return start_interval;
-                },
-                [](unixtime_t const start_time) {
-                  return interval<unixtime_t>{start_time, start_time};
-                }},
+            utl::overloaded{[](interval<unixtime_t> const start_interval) {
+                              return start_interval;
+                            },
+                            [](unixtime_t const start_time) {
+                              return interval<unixtime_t>{start_time,
+                                                          start_time};
+                            }},
             q_.start_time_)},
         fastest_direct_{get_fastest_direct(tt_, q_, SearchDir)},
         algo_{init(q_.allowed_claszes_,
@@ -209,13 +209,13 @@ struct search {
             "timeout_reached={}\n",
             is_ontrip(), q_.extend_interval_earlier_, q_.extend_interval_later_,
             std::visit(
-                utl::overloaded{
-                    [](interval<unixtime_t> const& start_interval) {
-                      return start_interval;
-                    },
-                    [](unixtime_t const start_time) {
-                      return interval<unixtime_t>{start_time, start_time};
-                    }},
+                utl::overloaded{[](interval<unixtime_t> const& start_interval) {
+                                  return start_interval;
+                                },
+                                [](unixtime_t const start_time) {
+                                  return interval<unixtime_t>{start_time,
+                                                              start_time};
+                                }},
                 q_.start_time_),
             search_interval_, tt_.external_interval(), n_results_in_interval(),
             is_timeout_reached());
@@ -227,13 +227,13 @@ struct search {
             "number_of_results_in_interval={}\n",
             q_.extend_interval_earlier_, q_.extend_interval_later_,
             std::visit(
-                utl::overloaded{
-                    [](interval<unixtime_t> const& start_interval) {
-                      return start_interval;
-                    },
-                    [](unixtime_t const start_time) {
-                      return interval<unixtime_t>{start_time, start_time};
-                    }},
+                utl::overloaded{[](interval<unixtime_t> const& start_interval) {
+                                  return start_interval;
+                                },
+                                [](unixtime_t const start_time) {
+                                  return interval<unixtime_t>{start_time,
+                                                              start_time};
+                                }},
                 q_.start_time_),
             search_interval_, tt_.external_interval(), n_results_in_interval());
       }

diff --git a/src/loader/gtfs/trip.cc b/src/loader/gtfs/trip.cc
@@ -55,9 +55,8 @@ block::rule_services(trip_data& trips) {
     gtfs_trip_idx_t trip_;
     bitfield traffic_days_;
   };
-  auto rule_trips = utl::to_vec(trips_, [&](auto&& t) {
-    return rule_trip{t, *trips.get(t).service_};
-  });
+  auto rule_trips = utl::to_vec(
+      trips_, [&](auto&& t) { return rule_trip{t, *trips.get(t).service_}; });
 
   struct queue_entry {
     std::vector<rule_trip>::iterator current_it_;