Merge pull request #2225 from joto/cleanup

Various code cleanups

Author: lonvia

.clang-tidy

@@ -87,4 +87,8 @@ CheckOptions:
       value: 100
     - key: readability-function-cognitive-complexity.IgnoreMacros
       value: true
+    - key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove
+      value: true
+    - key: bugprone-empty-catch.IgnoreCatchWithKeywords
+      value: "@todo;@fixme;exception ignored on purpose"
 ...

src/expire-tiles.cpp

@@ -135,6 +135,8 @@ void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
     }
 }
 
+// False positive: Apparently clang-tidy can not see through the visit()
+// NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 void expire_tiles::from_geometry(geom::geometry_t const &geom,
                                  expire_config_t const &expire_config)
 {
@@ -174,7 +176,7 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     }
 
     double const y_len = tilec_b.y() - tilec_a.y();
-    double const hyp_len = sqrt(pow(x_len, 2) + pow(y_len, 2)); /* Pythagoras */
+    double const hyp_len = std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
     double const x_step = x_len / hyp_len;
     double const y_step = y_len / hyp_len;
 

src/gen/osm2pgsql-gen.cpp

@@ -159,7 +159,7 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
     auto const geom_column = params.get_string("geom_column", "geom");
     auto const raster_column = params.get_string("raster_column", "");
 
-    bool const is_raster = raster_column != "";
+    bool const is_raster = !raster_column.empty();
 
     return get_extent_from_db(db_connection, schema, table,
                               is_raster ? raster_column : geom_column,

src/geom-functions.cpp

@@ -437,6 +437,8 @@ class split_visitor
     void operator()(T) const
     {}
 
+    // false positive https://github.com/llvm/llvm-project/issues/74738
+    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(geom::collection_t &&geom) const
     {
         for (auto &&sgeom : geom) {
@@ -445,6 +447,8 @@ class split_visitor
     }
 
     template <typename T>
+    // false positive https://github.com/llvm/llvm-project/issues/74738
+    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(geom::multigeometry_t<T> &&geom) const
     {
         for (auto &&sgeom : geom) {

src/node-persistent-cache.cpp

@@ -56,6 +56,7 @@ node_persistent_cache::~node_persistent_cache() noexcept
         try {
             log_debug("Removing persistent node cache at '{}'.", m_file_name);
         } catch (...) {
+            // exception ignored on purpose
         }
         unlink(m_file_name.c_str());
     }

src/thread-pool.hpp

@@ -95,6 +95,7 @@ class thread_pool_t
      *         of the task can be queried.
      */
     template <typename TFunction>
+    // NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward) false positive
     std::future<std::chrono::microseconds> submit(TFunction &&func)
     {
         std::packaged_task<std::chrono::microseconds()> task{