refactor: Update to the latest version of yscope-dev-utils:

- Update taskfiles to use the latest yscope-dev-utils tasks.
- Update lint tools to use the latest yscope-dev-utils lint configs, and fix violations.

Author: anlowee

lint-requirements.txt

@@ -1,7 +1,5 @@
-# Lock to v19.x until we can upgrade our code to fix new v20 issues.
-clang-format~=19.1
-# Lock to v19.x until we can upgrade our code to fix new v20 issues.
-clang-tidy~=19.1
+clang-format>=20.1.0
+clang-tidy>=19.1.0
 colorama>=0.4.6
 gersemi>=0.16.2
 yamllint>=1.35.1

src/ystdlib/containers/test/test_Array.cpp

@@ -75,36 +75,36 @@ void test_list_initialization_in_function_call(
 
 namespace ystdlib::containers::test {
 TEST_CASE("test_array_empty", "[containers][Array]") {
-    Array<int> arr(0);
+    Array<size_t> arr(0);
     REQUIRE(arr.empty());
     // NOLINTNEXTLINE(readability-container-size-empty)
     REQUIRE((0 == arr.size()));
     REQUIRE((arr.begin() == arr.end()));
 }
 
 TEST_CASE("test_array_reference", "[containers][Array]") {
-    Array<int> arr(cBufferSize);
-    for (int idx{0}; idx < cBufferSize; ++idx) {
+    Array<size_t> arr(cBufferSize);
+    for (size_t idx{0}; idx < cBufferSize; ++idx) {
         arr.at(idx) = idx;
     }
     auto const& arr_const_ref = arr;
     REQUIRE(std::ranges::equal(arr, arr_const_ref));
 }
 
 TEST_CASE("test_array_ranged_copy", "[containers][Array]") {
-    std::vector<int> vec;
-    for (int idx{0}; idx < cBufferSize; ++idx) {
+    std::vector<size_t> vec;
+    for (size_t idx{0}; idx < cBufferSize; ++idx) {
         vec.push_back(idx);
     }
-    Array<int> arr(cBufferSize);
+    Array<size_t> arr(cBufferSize);
     std::ranges::copy(vec, arr.begin());
     REQUIRE(std::ranges::equal(vec, arr));
 }
 
 TEST_CASE("test_array_movable", "[containers][Array]") {
-    Array<int> arr(cBufferSize);
-    Array<int> reference_array(cBufferSize);
-    for (int idx{0}; idx < cBufferSize; ++idx) {
+    Array<size_t> arr(cBufferSize);
+    Array<size_t> reference_array(cBufferSize);
+    for (size_t idx{0}; idx < cBufferSize; ++idx) {
         arr.at(idx) = idx;
         reference_array.at(idx) = idx;
     }
@@ -113,7 +113,7 @@ TEST_CASE("test_array_movable", "[containers][Array]") {
 }
 
 TEST_CASE("test_array_illegal_access", "[containers][Array]") {
-    Array<int> arr(cBufferSize);
+    Array<size_t> arr(cBufferSize);
     REQUIRE_THROWS_AS(arr.at(-1), std::out_of_range);
     REQUIRE_THROWS_AS(arr.at(cBufferSize), std::out_of_range);
 }

src/ystdlib/error_handling/ErrorCode.hpp

@@ -87,7 +87,7 @@ class ErrorCode {
     /**
      * @return The reference to the singleton of the corresponded error category.
      */
-    [[nodiscard]] constexpr static auto get_category() -> ErrorCategory<ErrorCodeEnum> const& {
+    [[nodiscard]] static constexpr auto get_category() -> ErrorCategory<ErrorCodeEnum> const& {
         return cCategory;
     }
 

src/ystdlib/error_handling/test/test_Result.cpp

@@ -106,8 +106,8 @@ TEST_CASE("test_result_unique_ptr", "[error_handling][Result]") {
 
     auto const result_has_error{cUniquePtrFunc(true)};
     REQUIRE(result_has_error.has_error());
-    REQUIRE(AlwaysSuccessErrorCode{AlwaysSuccessErrorCodeEnum::Success} == result_has_error.error()
-    );
+    REQUIRE(AlwaysSuccessErrorCode{AlwaysSuccessErrorCodeEnum::Success}
+            == result_has_error.error());
 }
 
 TEST_CASE("test_result_unique_ptr_in_main", "[error_handling][Result]") {

taskfile.yaml

@@ -4,7 +4,7 @@ includes:
   build: "./taskfiles/build.yaml"
   deps: "./taskfiles/deps.yaml"
   lint: "./taskfiles/lint.yaml"
-  utils: "tools/yscope-dev-utils/taskfiles/utils.yaml"
+  utils: "tools/yscope-dev-utils/exports/taskfiles/utils/utils.yaml"
 
 vars:
   G_BUILD_DIR: "{{.ROOT_DIR}}/build"

taskfiles/build.yaml

@@ -10,7 +10,7 @@ tasks:
     deps:
       - "init"
     cmds:
-      - task: ":utils:cmake-build"
+      - task: ":utils:cmake:build"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
 
@@ -21,7 +21,7 @@ tasks:
     deps:
       - "init"
     cmds:
-      - task: ":utils:cmake-build"
+      - task: ":utils:cmake:build"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
           TARGETS:
@@ -49,7 +49,7 @@ tasks:
   clean:
     desc: "Removes all built artifacts."
     deps:
-      - task: ":utils:cmake-clean"
+      - task: ":utils:cmake:clean"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
 
@@ -59,7 +59,7 @@ tasks:
       - ":deps:install-all"
     run: "once"
     cmds:
-      - task: ":utils:cmake-generate"
+      - task: ":utils:cmake:generate"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
           SOURCE_DIR: "{{.ROOT_DIR}}"

taskfiles/deps.yaml

@@ -13,98 +13,62 @@ tasks:
     desc: "Install all dependencies required by ystdlib-cpp."
     run: "once"
     cmds:
-      - task: "install-all-init"
-      - task: "install-all-run"
-      - task: "install-all-finish"
-
-  install-all-init:
-    internal: true
-    cmds:
-      - "rm -rf {{.G_DEPS_CMAKE_SETTINGS_DIR}}"
-      - "mkdir -p {{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+      - "rm -rf '{{.G_DEPS_CMAKE_SETTINGS_DIR}}'"
+      - "mkdir -p '{{.G_DEPS_CMAKE_SETTINGS_DIR}}'"
+      - task: ":utils:cmake:install-deps-and-generate-settings"
+        vars:
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+          CMAKE_SETTINGS_FILE: "{{.G_DEPS_CMAKE_SETTINGS_FILE}}"
+          DEP_TASK: "deps:install-all-parallel"
 
-  install-all-run:
+  install-all-parallel:
     internal: true
     deps:
       - "install-Catch2"
       - "install-outcome"
 
-  install-all-finish:
-    internal: true
-    cmds:
-      - >-
-        for file in {{.G_DEPS_CMAKE_SETTINGS_DIR}}/*.cmake; do
-          if [ "$file" != "{{.G_DEPS_CMAKE_SETTINGS_FILE}}" ]; then
-            echo "include(\"$file\")" >> "{{.G_DEPS_CMAKE_SETTINGS_FILE}}";
-          fi
-        done
-
-  add-package-root-to-cmake-settings:
-    internal: true
-    requires:
-      vars:
-        - "NAME"
-        - "INSTALL_PREFIX"
-    cmds:
-      - >-
-        echo "set(
-          {{.NAME}}_ROOT
-          \"{{.INSTALL_PREFIX}}\"
-          CACHE PATH
-          \"Path to {{.NAME}} settings\"
-        )" >> "{{.G_DEPS_CMAKE_SETTINGS_DIR}}/{{.NAME}}.cmake"
-
   install-Catch2:
     internal: true
     run: "once"
     cmds:
-      - task: ":utils:cmake-install-remote-tar"
+      - task: ":utils:cmake:install-remote-tar"
         vars:
-          NAME: "{{.G_CATCH2_LIB_NAME}}"
+          CMAKE_PACKAGE_NAME: "{{.G_CATCH2_LIB_NAME}}"
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+          TAR_SHA256: "1ab2de20460d4641553addfdfe6acd4109d871d5531f8f519a52ea4926303087"
+          TAR_URL: "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz"
           WORK_DIR: "{{.G_CATCH2_WORK_DIR}}"
-          FILE_SHA256: "1ab2de20460d4641553addfdfe6acd4109d871d5531f8f519a52ea4926303087"
-          URL: "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz"
-      - task: "add-package-root-to-cmake-settings"
-        vars:
-          NAME: "{{.G_CATCH2_LIB_NAME}}"
-          INSTALL_PREFIX: "{{.G_CATCH2_WORK_DIR}}/{{.G_CATCH2_LIB_NAME}}-install"
 
   install-outcome:
     internal: true
     run: "once"
     deps:
       - "install-quickcpplib"
     cmds:
-      - task: ":utils:cmake-install-remote-tar"
+      - task: ":utils:cmake:install-remote-tar"
         vars:
-          NAME: "{{.G_OUTCOME_LIB_NAME}}"
-          WORK_DIR: "{{.G_OUTCOME_WORK_DIR}}"
-          FILE_SHA256: "0382248cbb00806ce4b5f3ce6939797dc3b597c85fd3531614959e31ef488b39"
-          URL: "https://github.com/ned14/outcome/archive/refs/tags/v2.2.11.tar.gz"
-          GEN_ARGS:
+          CMAKE_GEN_ARGS:
             - "-C {{.G_DEPS_CMAKE_SETTINGS_DIR}}/{{.G_QUICKCPPLIB_LIB_NAME}}.cmake"
             - "-DBUILD_TESTING=OFF"
             - "-DCMAKE_BUILD_TYPE=Release"
             - "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"
-      - task: "add-package-root-to-cmake-settings"
-        vars:
-          NAME: "{{.G_OUTCOME_LIB_NAME}}"
-          INSTALL_PREFIX: "{{.G_OUTCOME_WORK_DIR}}/{{.G_OUTCOME_LIB_NAME}}-install"
+          CMAKE_PACKAGE_NAME: "{{.G_OUTCOME_LIB_NAME}}"
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+          TAR_SHA256: "0382248cbb00806ce4b5f3ce6939797dc3b597c85fd3531614959e31ef488b39"
+          TAR_URL: "https://github.com/ned14/outcome/archive/refs/tags/v2.2.11.tar.gz"
+          WORK_DIR: "{{.G_OUTCOME_WORK_DIR}}"
 
   install-quickcpplib:
     internal: true
     run: "once"
     cmds:
-      - task: ":utils:cmake-install-remote-tar"
+      - task: ":utils:cmake:install-remote-tar"
         vars:
-          NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"
-          WORK_DIR: "{{.G_QUICKCPPLIB_WORK_DIR}}"
-          FILE_SHA256: "5d4c9b2d6fa177d3fb14f3fe3086867e43b44f4a7a944eb10ee4616b2b0f3c05"
-          URL: "https://github.com/ned14/quickcpplib/archive/f3e452e.tar.gz"
-          GEN_ARGS:
+          CMAKE_GEN_ARGS:
             - "-DBUILD_TESTING=OFF"
             - "-DCMAKE_BUILD_TYPE=Release"
-      - task: "add-package-root-to-cmake-settings"
-        vars:
-          NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"
-          INSTALL_PREFIX: "{{.G_QUICKCPPLIB_WORK_DIR}}/{{.G_QUICKCPPLIB_LIB_NAME}}-install"
+          CMAKE_PACKAGE_NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+          TAR_SHA256: "5d4c9b2d6fa177d3fb14f3fe3086867e43b44f4a7a944eb10ee4616b2b0f3c05"
+          TAR_URL: "https://github.com/ned14/quickcpplib/archive/f3e452e.tar.gz"
+          WORK_DIR: "{{.G_QUICKCPPLIB_WORK_DIR}}"

taskfiles/lint-cpp.yaml

@@ -1,5 +1,8 @@
 version: "3"
 
+vars:
+  G_LINT_CLANG_TIDY_DIR: "{{.G_BUILD_DIR}}/lint-clang-tidy"
+
 tasks:
   cpp-check:
     desc: "Runs the C++ linters."
@@ -26,11 +29,11 @@ tasks:
       - "cpp-configs"
       - "venv"
     cmds:
-      - task: ":utils:clang-format"
+      - task: ":utils:cpp-lint:clang-format"
         vars:
-          FLAGS: "--dry-run"
-          SRC_PATHS:
-            ref: ".G_LINT_CPP_DIRS"
+          FLAGS: ["--dry-run"]
+          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-format-fix:
@@ -40,11 +43,11 @@ tasks:
       - "cpp-configs"
       - "venv"
     cmds:
-      - task: ":utils:clang-format"
+      - task: ":utils:cpp-lint:clang-format"
         vars:
-          FLAGS: "-i"
-          SRC_PATHS:
-            ref: ".G_LINT_CPP_DIRS"
+          FLAGS: ["-i"]
+          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-static-check:
@@ -55,38 +58,29 @@ tasks:
     aliases:
       - "cpp-static-fix"
     desc: "Runs the C++ static analyzers. Only checks for warnings and violations."
-    sources:
-      - "{{.G_CMAKE_CACHE}}"
-      - "{{.G_COMPILE_COMMANDS_DB}}"
-      - "{{.G_LINT_VENV_CHECKSUM_FILE}}"
-      - "{{.G_CPP_SRC_DIR}}/**/*.cpp"
-      - "{{.G_CPP_SRC_DIR}}/**/*.h"
-      - "{{.G_CPP_SRC_DIR}}/**/*.hpp"
-      - "{{.ROOT_DIR}}/.clang-tidy"
-      - "{{.TASKFILE}}"
     deps:
       - ":build:init"
       - "cpp-configs"
       - "venv"
     cmds:
-      - task: ":utils:clang-tidy"
+      - task: ":utils:cpp-lint:clang-tidy-find"
         vars:
-          FLAGS: >-
-            --config-file "{{.ROOT_DIR}}/.clang-tidy"
-            -p "{{.G_COMPILE_COMMANDS_DB}}"
-          SRC_PATHS:
-            ref: ".G_LINT_CPP_DIRS"
+          FLAGS:
+            - "--config-file '{{.ROOT_DIR}}/.clang-tidy'"
+            - "-p '{{.G_COMPILE_COMMANDS_DB}}'"
+          OUTPUT_DIR: "{{.G_LINT_CLANG_TIDY_DIR}}"
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-configs:
     internal: true
     sources:
-      - "{{.ROOT_DIR}}/tools/yscope-dev-utils/lint-configs/.clang-format"
-      - "{{.ROOT_DIR}}/tools/yscope-dev-utils/lint-configs/.clang-tidy"
+      - "{{.ROOT_DIR}}/tools/yscope-dev-utils/exports/lint-configs/.clang-format"
+      - "{{.ROOT_DIR}}/tools/yscope-dev-utils/exports/lint-configs/.clang-tidy"
       - "{{.TASKFILE}}"
     generates:
       - "{{.ROOT_DIR}}/.clang-format"
       - "{{.ROOT_DIR}}/.clang-tidy"
     dir: "{{.ROOT_DIR}}"
     cmds:
-      - "tools/yscope-dev-utils/lint-configs/symlink-cpp-lint-configs.sh"
+      - "tools/yscope-dev-utils/exports/lint-configs/symlink-cpp-lint-configs.sh"

taskfiles/lint-venv.yaml

@@ -15,18 +15,18 @@ tasks:
     run: "once"
     deps:
       - ":init"
-      - task: ":utils:validate-checksum"
+      - task: ":utils:checksum:validate"
         vars:
           CHECKSUM_FILE: "{{.CHECKSUM_FILE}}"
           INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"]
     cmds:
-      - task: ":utils:create-venv"
+      - task: ":utils:misc:create-venv"
         vars:
           LABEL: "lint"
           OUTPUT_DIR: "{{.OUTPUT_DIR}}"
           REQUIREMENTS_FILE: "{{.ROOT_DIR}}/lint-requirements.txt"
       # This command must be last
-      - task: ":utils:compute-checksum"
+      - task: ":utils:checksum:compute"
         vars:
           CHECKSUM_FILE: "{{.CHECKSUM_FILE}}"
           INCLUDE_PATTERNS: ["{{.OUTPUT_DIR}}"]

taskfiles/lint-yaml.yaml

@@ -13,16 +13,24 @@ tasks:
       - "{{.TASKFILE}}"
       - exclude: "{{.ROOT_DIR}}/**/build/*"
       - exclude: "{{.ROOT_DIR}}/**/tools/*"
+
+      # Exclude CMake build directories generated by CLion
+      - exclude: "{{.ROOT_DIR}}/**/cmake-build-*"
     dir: "{{.ROOT_DIR}}"
     deps:
       - "venv"
     cmds:
       - |-
         . "{{.G_LINT_VENV_DIR}}/bin/activate"
         find . \
-          \( -path '**/build' -o -path '**/tools' \) -prune -o \
+          \( \
+            -path '**/build' \
+            -o -path '**/tools' \
+            -o -path '**/cmake-build-*' \
+          \) -prune -o \
           \( -iname "*.yaml" -o -iname "*.yml" \) \
           -print0 | \
-            xargs -0 yamllint \
-              --config-file "tools/yscope-dev-utils/lint-configs/.yamllint.yml" \
-              --strict
+            xargs -0 \
+              yamllint \
+                --config-file "tools/yscope-dev-utils/exports/lint-configs/.yamllint.yml" \
+                --strict