Jelajahi Sumber

ci(pre-commit): version bump `typos` hook plus fix found typos

Alex Turbov 1 Minggu lalu
induk
melakukan
8de02a14c8

+ 1 - 1
.pre-commit-config.yaml

@@ -110,7 +110,7 @@ repos:
 
     # NOTE See BUG https://github.com/crate-ci/typos/issues/390
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.36.1
+    rev: v1.38.1
     hooks:
       - id: typos
         # NOTE Override hook's default args to prevent automatic

+ 9 - 0
.typos.toml

@@ -20,6 +20,12 @@ locale = "en-us"
 # script accordingly.
 #extend-ignore-identifiers-re=["\\b[0-9a-f]{8,12}\\b"]
 
+[default.extend-identifiers]
+_tru64 = "_tru64"
+__tru64 = "__tru64"
+__TRU64__ = "__TRU64__"
+Tru64 = "Tru64"
+
 # Add repo-wide false positives here in the form of `word = "word"`.
 # Check the manual for details.
 [default.extend-words]
@@ -83,6 +89,9 @@ SEH = "SEH"
 [type.py.extend-identifiers]
 typ = "typ"
 
+[type.sh.extend-identifiers]
+xTRUEx = "xTRUEx"
+
 [type.rst]
 extend-ignore-re = [
     # NOTE Allow to mark block of text to exclude from spellchecking as RST comments

+ 3 - 3
Modules/CPackIFW.cmake

@@ -645,7 +645,7 @@ macro(_cpack_ifw_resolve_script _variable)
 endmacro()
 
 # Resolve full path to license file
-macro(_cpack_ifw_resolve_lisenses _variable)
+macro(_cpack_ifw_resolve_licenses _variable)
   if(${_variable})
     set(_ifw_license_file FALSE)
     set(_ifw_licenses_fix)
@@ -689,7 +689,7 @@ macro(cpack_ifw_configure_component compname)
   cmake_parse_arguments(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
 
   _cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_SCRIPT)
-  _cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_LICENSES)
+  _cpack_ifw_resolve_licenses(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_LICENSES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_USER_INTERFACES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_TRANSLATIONS)
 
@@ -730,7 +730,7 @@ macro(cpack_ifw_configure_component_group grpname)
   cmake_parse_arguments(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
 
   _cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_SCRIPT)
-  _cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_LICENSES)
+  _cpack_ifw_resolve_licenses(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_LICENSES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_USER_INTERFACES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_TRANSLATIONS)
 

+ 2 - 2
Modules/Internal/CPack/CPackRPM.cmake

@@ -445,13 +445,13 @@ function(cpack_rpm_symlink_create_relocation_script PACKAGE_PREFIXES)
 endfunction()
 
 function(cpack_rpm_symlink_add_for_relocation_script PACKAGE_PREFIXES SYMLINK SYMLINK_RELOCATION_PATHS POINT POINT_RELOCATION_PATHS)
-  list(LENGTH SYMLINK_RELOCATION_PATHS SYMLINK_PATHS_COUTN)
+  list(LENGTH SYMLINK_RELOCATION_PATHS SYMLINK_PATHS_COUNT)
   list(LENGTH POINT_RELOCATION_PATHS POINT_PATHS_COUNT)
 
   list(APPEND _RPM_RELOCATION_SCRIPT_PAIRS "${SYMLINK}:${POINT}")
   list(LENGTH _RPM_RELOCATION_SCRIPT_PAIRS PAIR_NO)
 
-  if(SYMLINK_PATHS_COUTN)
+  if(SYMLINK_PATHS_COUNT)
     foreach(SYMLINK_RELOC_PATH IN LISTS SYMLINK_RELOCATION_PATHS)
       list(FIND PACKAGE_PREFIXES "${SYMLINK_RELOC_PATH}" SYMLINK_INDEX)
 

+ 2 - 2
Source/cmNinjaTargetGenerator.cxx

@@ -1698,10 +1698,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
     if (ispcSuffixes.size() > 1) {
       std::string rootObjectDir =
         this->GeneratorTarget->GetObjectDirectory(config);
-      auto ispcSideEfffectObjects = detail::ComputeISPCExtraObjects(
+      auto ispcSideEffectObjects = detail::ComputeISPCExtraObjects(
         objectName, rootObjectDir, ispcSuffixes);
 
-      for (auto sideEffect : ispcSideEfffectObjects) {
+      for (auto sideEffect : ispcSideEffectObjects) {
         sideEffect = this->ConvertToNinjaPath(sideEffect);
         objBuild.ImplicitOuts.emplace_back(sideEffect);
         this->GetGlobalGenerator()->AddAdditionalCleanFile(sideEffect, config);