Enable clang-tidy checks for core libraries

Author: bastikr

.clang-tidy

@@ -21,7 +21,8 @@ Checks: >
   -clang-diagnostic-unused-command-line-argument,
   -modernize-use-trailing-return-type,
   -fuchsia-trailing-return,
-  -cppcoreguidelines-pro-type-vararg
+  -cppcoreguidelines-pro-type-vararg,
+  -*-magic-numbers
 WarningsAsErrors: "*"
 FormatStyle: file
 CheckOptions:
@@ -39,8 +40,8 @@ CheckOptions:
     value: lower_case
   - key: readability-identifier-naming.VariableCase
     value: lower_case
-  - key: readability-identifier-naming.GlobalVariablePrefix
-    value: g_
+  # - key: readability-identifier-naming.GlobalVariablePrefix
+  #   value: g_
   - key: readability-identifier-naming.MemberCase
     value: lower_case
   - key: readability-identifier-naming.PrivateMemberPrefix

lib/cmake/generate.cmake

@@ -52,6 +52,9 @@ function(write_cpp_intro target_name target_path)
 
 #include <array>
 #include <cstddef>
+#include <optional>
+#include <span>
+#include <string_view>
 
 using crl::DirectoryEntry;
 using crl::FileEntry;
@@ -247,10 +250,9 @@ endfunction()
 function(write_gperf_input_file target_name resource_files target_path)
     file(WRITE "${target_path}"
 "%{
-#include <${target_name}.h>
-
 #include <cstring>
 
+// NOLINTBEGIN(misc-unused-parameters, cppcoreguidelines-avoid-goto)
 namespace ${target_name} {
 
 %}
@@ -271,6 +273,8 @@ struct PerfectHashResult { const char *name; std::span<const std::byte> data; };
     endforeach()
 file(APPEND "${target_path}"
 "%%
+// NOLINTEND(misc-unused-parameters, cppcoreguidelines-avoid-goto)
+
 std::optional<std::span<const std::byte>> get_file_ph(std::string_view path) {
     const PerfectHashResult *f = PerfectHash::in_word_set(path.data(), path.size());
     if (f == nullptr) {

lib/crl/src/crl.cpp

@@ -1,5 +1,10 @@
 #include <crl/crl.h>
 
+#include <cstddef>
+#include <optional>
+#include <span>
+#include <string_view>
+
 namespace crl {
 
 std::optional<std::span<const std::byte>>
@@ -15,7 +20,7 @@ get_file(const crl::DirectoryEntry &directory, std::string_view path) {
             }
             return {};
         }
-        std::string_view sub_d_name = path.substr(0, pos);
+        const std::string_view sub_d_name = path.substr(0, pos);
         bool found_match = false;
         for (const auto &sub_d : d->subdirectories) {
             if (sub_d->name == sub_d_name) {

lib/crl/src/crlv.cpp

@@ -1,7 +1,13 @@
 #include <crl/crlv.h>
 
+#include <crl/crl.h>
 #include <crl/utils/strv.h>
 
+#include <cstddef>
+#include <optional>
+#include <span>
+#include <string_view>
+
 namespace crl {
 
 std::optional<std::span<const std::byte>>

lib/crl/src/utils_strv.cpp

@@ -1,5 +1,9 @@
 #include <crl/utils/strv.h>
 
+#include <cstddef>
+#include <span>
+#include <string_view>
+
 namespace crl::utils::strv {
 
 size_t sizev(std::span<std::string_view> strv) {
@@ -22,9 +26,10 @@ size_t findv(std::span<std::string_view> strv, size_t start, size_t len,
             continue;
         }
 
-        size_t process_len = std::min(s.size() - start, remaining_len);
-        auto sub_s = s.substr(start, process_len);
-        size_t p = sub_s.find(x);
+        const size_t d = s.size() - start;
+        const size_t process_len = d < remaining_len ? d : remaining_len;
+        const auto sub_s = s.substr(start, process_len);
+        const size_t p = sub_s.find(x);
 
         if (p != std::string_view::npos) {
             return pos + start + p;
@@ -53,7 +58,8 @@ bool equalv(std::span<std::string_view> strv, size_t start, size_t len,
             continue;
         }
 
-        size_t process_len = std::min(s.size() - start, remaining_len);
+        const size_t d = s.size() - start;
+        const size_t process_len = d < remaining_len ? d : remaining_len;
 
         if (pos + process_len > x.size()) {
             return false;

tests/CMakeLists.txt

@@ -1,9 +1,10 @@
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.24)
 project(crl-tests)
 
 # GoogleTest requires at least C++14
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CLANG_TIDY_COMMAND "clang-tidy")
 
 include(FetchContent)
 FetchContent_Declare(
@@ -23,10 +24,14 @@ enable_testing()
 
 add_subdirectory(.. crl)
 
+set_target_properties(crl PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
+
 add_executable(test_utils_strv
     "src/test_utils_strv.cpp"
 )
 
+set_target_properties(test_utils_strv PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
+
 target_link_libraries(test_utils_strv
     PRIVATE
         GTest::gtest_main

tests/src/test_utils_strv.cpp

@@ -2,58 +2,56 @@
 
 #include <crl/utils/strv.h>
 
+#include <array>
+#include <cstddef>
+#include <string_view>
+
 TEST(Crlv, sizev) {
     using crl::utils::strv::sizev;
 
-    std::string_view b0;
-    std::string_view b1 = "1";
-    std::string_view b4 = "1234";
+    const std::string_view b0;
+    const std::string_view b1 = "1";
+    const std::string_view b4 = "1234";
 
     {
         std::array<std::string_view, 0> b{};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 0);
+        ASSERT_EQ(sizev(b), 0);
     }
 
     {
         std::array<std::string_view, 1> b{b0};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 0);
+        ASSERT_EQ(sizev(b), 0);
     }
 
     {
         std::array<std::string_view, 1> b{b1};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 1);
+        ASSERT_EQ(sizev(b), 1);
     }
 
     {
         std::array<std::string_view, 1> b{b4};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 4);
+        ASSERT_EQ(sizev(b), 4);
     }
 
     {
         std::array<std::string_view, 3> b{b0, b4, b0};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 4);
+        ASSERT_EQ(sizev(b), 4);
     }
 
     {
         std::array<std::string_view, 3> b{b4, b1, b4};
-        size_t s = sizev(b);
-        ASSERT_EQ(s, 9);
+        ASSERT_EQ(sizev(b), 9);
     }
 }
 
 TEST(Crlv, findv) {
     using crl::utils::strv::findv;
     using crl::utils::strv::sizev;
 
-    std::string_view b1 = "logs";
-    std::string_view b2 = "/";
-    std::string_view b3 = "source";
-    std::string_view b4 = "/t.txt";
+    const std::string_view b1 = "logs";
+    const std::string_view b2 = "/";
+    const std::string_view b3 = "source";
+    const std::string_view b4 = "/t.txt";
     std::array<std::string_view, 4> b{b1, b2, b3, b4};
 
     size_t p = findv(b, 0, sizev(b), '/');
@@ -72,9 +70,9 @@ TEST(Crlv, findv) {
 
 TEST(Crlv, equalv) {
     using crl::utils::strv::equalv;
-    std::string_view b0;
-    std::string_view b1 = "x";
-    std::string_view b4 = "1234";
+    const std::string_view b0;
+    const std::string_view b1 = "x";
+    const std::string_view b4 = "1234";
 
     {
         std::array<std::string_view, 0> b{};