llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-tidy Author: Zeyi Xu (zeyi2) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/196681.diff 17 Files Affected: - (modified) clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp (-34) - (added) clang-tools-extra/clangd/.clang-format-ignore (+2) - (modified) clang-tools-extra/clangd/TidyFastChecks.inc (-8) - (modified) clang-tools-extra/docs/ReleaseNotes.rst (+1-13) - (modified) clang-tools-extra/docs/clang-tidy/checks/bugprone/unused-return-value.rst (-5) - (modified) clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst (+1-3) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-c-arrays.rst (-9) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst (-9) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/braces-around-statements.rst (-11) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/deprecated-headers.rst (-9) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/exception-baseclass.rst (-8) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/explicit-conversions.rst (-23) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/function-size.rst (-12) - (removed) clang-tools-extra/docs/clang-tidy/checks/hicpp/ignored-remove-result.rst (-8) - (modified) clang-tools-extra/docs/clang-tidy/checks/list.rst (-8) - (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/avoid-c-arrays.rst (-2) - (renamed) clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-remove.cpp (+4-2) ``````````diff diff --git a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp index 501e7fc0e2d9b..e628c81db6955 100644 --- a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp @@ -9,21 +9,15 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" #include "../bugprone/SignedBitwiseCheck.h" -#include "../bugprone/StdExceptionBaseclassCheck.h" #include "../bugprone/UndelegatedConstructorCheck.h" -#include "../bugprone/UnusedReturnValueCheck.h" #include "../bugprone/UseAfterMoveCheck.h" -#include "../cppcoreguidelines/AvoidGotoCheck.h" #include "../cppcoreguidelines/NoMallocCheck.h" #include "../cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.h" #include "../cppcoreguidelines/ProTypeMemberInitCheck.h" #include "../cppcoreguidelines/ProTypeVarargCheck.h" #include "../cppcoreguidelines/SpecialMemberFunctionsCheck.h" -#include "../google/ExplicitConstructorCheck.h" #include "../misc/NewDeleteOverloadsCheck.h" #include "../misc/StaticAssertCheck.h" -#include "../modernize/AvoidCArraysCheck.h" -#include "../modernize/DeprecatedHeadersCheck.h" #include "../modernize/UseAutoCheck.h" #include "../modernize/UseEmplaceCheck.h" #include "../modernize/UseEqualsDefaultCheck.h" @@ -34,8 +28,6 @@ #include "../performance/MoveConstArgCheck.h" #include "../performance/NoexceptMoveConstructorCheck.h" #include "../portability/NoAssemblerCheck.h" -#include "../readability/BracesAroundStatementsCheck.h" -#include "../readability/FunctionSizeCheck.h" #include "../readability/NamedParameterCheck.h" #include "../readability/UppercaseLiteralSuffixCheck.h" #include "MultiwayPathsCoveredCheck.h" @@ -47,26 +39,10 @@ namespace { class HICPPModule : public ClangTidyModule { public: void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { - CheckFactories.registerCheck<modernize::AvoidCArraysCheck>( - "hicpp-avoid-c-arrays"); - CheckFactories.registerCheck<cppcoreguidelines::AvoidGotoCheck>( - "hicpp-avoid-goto"); - CheckFactories.registerCheck<readability::BracesAroundStatementsCheck>( - "hicpp-braces-around-statements"); - CheckFactories.registerCheck<modernize::DeprecatedHeadersCheck>( - "hicpp-deprecated-headers"); - CheckFactories.registerCheck<bugprone::StdExceptionBaseclassCheck>( - "hicpp-exception-baseclass"); - CheckFactories.registerCheck<bugprone::UnusedReturnValueCheck>( - "hicpp-ignored-remove-result"); CheckFactories.registerCheck<MultiwayPathsCoveredCheck>( "hicpp-multiway-paths-covered"); CheckFactories.registerCheck<bugprone::SignedBitwiseCheck>( "hicpp-signed-bitwise"); - CheckFactories.registerCheck<google::ExplicitConstructorCheck>( - "hicpp-explicit-conversions"); - CheckFactories.registerCheck<readability::FunctionSizeCheck>( - "hicpp-function-size"); CheckFactories.registerCheck<readability::NamedParameterCheck>( "hicpp-named-parameter"); CheckFactories.registerCheck<bugprone::UseAfterMoveCheck>( @@ -111,16 +87,6 @@ class HICPPModule : public ClangTidyModule { CheckFactories.registerCheck<cppcoreguidelines::ProTypeVarargCheck>( "hicpp-vararg"); } - - ClangTidyOptions getModuleOptions() override { - ClangTidyOptions Options; - ClangTidyOptions::OptionMap &Opts = Options.CheckOptions; - Opts["hicpp-ignored-remove-result.CheckedFunctions"] = - "^::std::remove$;^::std::remove_if$;^::std::unique$"; - Opts["hicpp-ignored-remove-result.CheckedReturnTypes"] = ""; - Opts["hicpp-ignored-remove-result.AllowCastToVoid"] = "true"; - return Options; - } }; } // namespace diff --git a/clang-tools-extra/clangd/.clang-format-ignore b/clang-tools-extra/clangd/.clang-format-ignore new file mode 100644 index 0000000000000..c77a4b67b098a --- /dev/null +++ b/clang-tools-extra/clangd/.clang-format-ignore @@ -0,0 +1,2 @@ +# Keep these entries unformatted. +TidyFastChecks.inc diff --git a/clang-tools-extra/clangd/TidyFastChecks.inc b/clang-tools-extra/clangd/TidyFastChecks.inc index 15fc27cf81c01..c1a72bae035b7 100644 --- a/clang-tools-extra/clangd/TidyFastChecks.inc +++ b/clang-tools-extra/clangd/TidyFastChecks.inc @@ -272,14 +272,6 @@ FAST(google-runtime-float, 1.0) FAST(google-runtime-int, 2.0) FAST(google-runtime-operator, 1.0) FAST(google-upgrade-googletest-case, 1.0) -FAST(hicpp-avoid-c-arrays, 2.0) -FAST(hicpp-avoid-goto, -0.0) -FAST(hicpp-braces-around-statements, 1.0) -FAST(hicpp-deprecated-headers, -0.0) -FAST(hicpp-exception-baseclass, 1.0) -FAST(hicpp-explicit-conversions, 2.0) -FAST(hicpp-function-size, 1.0) -FAST(hicpp-ignored-remove-result, 2.0) FAST(hicpp-invalid-access-moved, 9.0) FAST(hicpp-member-init, 2.0) FAST(hicpp-move-const-arg, 2.0) diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index 52aaa2d0df552..89520f077be3c 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -195,22 +195,10 @@ New checks New check aliases ^^^^^^^^^^^^^^^^^ -- New alias :doc:`cert-exp45-c <clang-tidy/checks/cert/exp45-c>` +- Renamed :doc:`cert-exp45-c <clang-tidy/checks/cert/exp45-c>` to :doc:`bugprone-assignment-in-selection-statement <clang-tidy/checks/bugprone/assignment-in-selection-statement>`. -- Renamed :doc:`hicpp-exception-baseclass - <clang-tidy/checks/hicpp/exception-baseclass>` - to :doc:`bugprone-std-exception-baseclass - <clang-tidy/checks/bugprone/std-exception-baseclass>`. - The `hicpp-exception-baseclass` name is kept as an alias. - -- Renamed :doc:`hicpp-ignored-remove-result - <clang-tidy/checks/hicpp/ignored-remove-result>` - to :doc:`bugprone-unused-return-value - <clang-tidy/checks/bugprone/unused-return-value>`. - The `hicpp-ignored-remove-result` name is kept as an alias. - - Renamed :doc:`hicpp-no-assembler <clang-tidy/checks/hicpp/no-assembler>` to :doc:`portability-no-assembler <clang-tidy/checks/portability/no-assembler>`. The `hicpp-no-assembler` diff --git a/clang-tools-extra/docs/clang-tidy/checks/bugprone/unused-return-value.rst b/clang-tools-extra/docs/clang-tidy/checks/bugprone/unused-return-value.rst index 3e7c51a9b1ac4..725403a6eb818 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/bugprone/unused-return-value.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/bugprone/unused-return-value.rst @@ -67,8 +67,3 @@ Options :doc:`cert-err33-c <../cert/err33-c>` is an alias of this check that checks a fixed and large set of standard library functions. - -:doc:`hicpp-ignored-remove-result <../hicpp/ignored-remove-result>` is an -alias of this check that checks a restricted set of functions: -``std::remove``, ``std::remove_if``, and ``std::unique``. -The `AllowCastToVoid` option is set to `true` by default. diff --git a/clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst b/clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst index 87e14bbe8a850..f8a57df1cb61d 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst @@ -8,9 +8,7 @@ with looping constructs. Only forward jumps in nested loops are accepted. This check implements `ES.76 <https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#es76-avoid-goto>`_ -from the C++ Core Guidelines and -`6.3.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_ -from High Integrity C++ Coding Standard. +from the C++ Core Guidelines. For more information on why to avoid programming with ``goto`` you can read the famous paper `A Case against the GO TO Statement. <https://www.cs.utexas.edu/users/EWD/ewd02xx/EWD215.PDF>`_. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-c-arrays.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-c-arrays.rst deleted file mode 100644 index ad7198831d0d0..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-c-arrays.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. title:: clang-tidy - hicpp-avoid-c-arrays - -hicpp-avoid-c-arrays -==================== - -The hicpp-avoid-c-arrays check is an alias, please see -:doc:`modernize-avoid-c-arrays <../modernize/avoid-c-arrays>` -for more information. -It partly enforces the `rule 4.1.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst deleted file mode 100644 index eb5d303477cab..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. title:: clang-tidy - hicpp-avoid-goto - -hicpp-avoid-goto -================ - -The `hicpp-avoid-goto` check is an alias, please see -:doc:`cppcoreguidelines-avoid-goto <../cppcoreguidelines/avoid-goto>` -for more information. -It enforces the `rule 6.3.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/braces-around-statements.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/braces-around-statements.rst deleted file mode 100644 index 9584126c2bb88..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/braces-around-statements.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. title:: clang-tidy - hicpp-braces-around-statements - -hicpp-braces-around-statements -============================== - -The `hicpp-braces-around-statements` check is an alias, please see -:doc:`readability-braces-around-statements -<../readability/braces-around-statements>` -for more information. -It enforces the `rule 6.1.1 -<https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/deprecated-headers.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/deprecated-headers.rst deleted file mode 100644 index a90ec85e6d0e1..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/deprecated-headers.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. title:: clang-tidy - hicpp-deprecated-headers - -hicpp-deprecated-headers -======================== - -The `hicpp-deprecated-headers` check is an alias, please see -:doc:`modernize-deprecated-headers <../modernize/deprecated-headers>` -for more information. -It enforces the `rule 1.3.3 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/exception-baseclass.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/exception-baseclass.rst deleted file mode 100644 index 5f54565f5f9c6..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/exception-baseclass.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. title:: clang-tidy - hicpp-exception-baseclass - -hicpp-exception-baseclass -========================= - -The `hicpp-exception-baseclass` check is an alias, please see -`bugprone-std-exception-baseclass <../bugprone/std-exception-baseclass.html>`_ -for more information. diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/explicit-conversions.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/explicit-conversions.rst deleted file mode 100644 index 927f7aaf015ff..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/explicit-conversions.rst +++ /dev/null @@ -1,23 +0,0 @@ -.. title:: clang-tidy - hicpp-explicit-conversions - -hicpp-explicit-conversions -========================== - -This check is an alias for -:doc:`google-explicit-constructor <../google/explicit-constructor>`. - -Used to enforce parts of `rule 5.4.1 -<https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_. -This check will enforce that constructors and conversion operators are -marked ``explicit``. Other forms of casting checks are implemented in -other places. The following checks can be used to check for more forms -of casting: - -- :doc:`cppcoreguidelines-pro-type-static-cast-downcast - <../cppcoreguidelines/pro-type-static-cast-downcast>` -- :doc:`cppcoreguidelines-pro-type-reinterpret-cast - <../cppcoreguidelines/pro-type-reinterpret-cast>` -- :doc:`cppcoreguidelines-pro-type-const-cast - <../cppcoreguidelines/pro-type-const-cast>` -- :doc:`cppcoreguidelines-pro-type-cstyle-cast - <../cppcoreguidelines/pro-type-cstyle-cast>` diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/function-size.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/function-size.rst deleted file mode 100644 index d54310f0e3624..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/function-size.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. title:: clang-tidy - hicpp-function-size - -hicpp-function-size -=================== - -This check is an alias for -:doc:`readability-function-size <../readability/function-size>`. -Useful to enforce multiple sections on function complexity. - -- `rule 8.2.2 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_ -- `rule 8.3.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_ -- `rule 8.3.2 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-rules>`_ diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/ignored-remove-result.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/ignored-remove-result.rst deleted file mode 100644 index bb3aee9ebaaae..0000000000000 --- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/ignored-remove-result.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. title:: clang-tidy - hicpp-ignored-remove-result - -hicpp-ignored-remove-result -=========================== - -The hicpp-ignored-remove-result check is an alias, please see -:doc:`bugprone-unused-return-value <../bugprone/unused-return-value>` -for more information. diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst index 053ce6f0779d9..79f1d4af11e37 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/list.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst @@ -601,14 +601,6 @@ Check aliases :doc:`google-readability-casting <google/readability-casting>`, :doc:`modernize-avoid-c-style-cast <modernize/avoid-c-style-cast>`, "Yes" :doc:`google-readability-function-size <google/readability-function-size>`, :doc:`readability-function-size <readability/function-size>`, :doc:`google-readability-namespace-comments <google/readability-namespace-comments>`, :doc:`llvm-namespace-comment <llvm/namespace-comment>`, - :doc:`hicpp-avoid-c-arrays <hicpp/avoid-c-arrays>`, :doc:`modernize-avoid-c-arrays <modernize/avoid-c-arrays>`, - :doc:`hicpp-avoid-goto <hicpp/avoid-goto>`, :doc:`cppcoreguidelines-avoid-goto <cppcoreguidelines/avoid-goto>`, - :doc:`hicpp-braces-around-statements <hicpp/braces-around-statements>`, :doc:`readability-braces-around-statements <readability/braces-around-statements>`, "Yes" - :doc:`hicpp-deprecated-headers <hicpp/deprecated-headers>`, :doc:`modernize-deprecated-headers <modernize/deprecated-headers>`, "Yes" - :doc:`hicpp-exception-baseclass <hicpp/exception-baseclass>`, :doc:`bugprone-std-exception-baseclass <bugprone/std-exception-baseclass>`, - :doc:`hicpp-explicit-conversions <hicpp/explicit-conversions>`, :doc:`google-explicit-constructor <google/explicit-constructor>`, "Yes" - :doc:`hicpp-function-size <hicpp/function-size>`, :doc:`readability-function-size <readability/function-size>`, - :doc:`hicpp-ignored-remove-result <hicpp/ignored-remove-result>`, :doc:`bugprone-unused-return-value <bugprone/unused-return-value>`, :doc:`hicpp-invalid-access-moved <hicpp/invalid-access-moved>`, :doc:`bugprone-use-after-move <bugprone/use-after-move>`, :doc:`hicpp-member-init <hicpp/member-init>`, :doc:`cppcoreguidelines-pro-type-member-init <cppcoreguidelines/pro-type-member-init>`, "Yes" :doc:`hicpp-move-const-arg <hicpp/move-const-arg>`, :doc:`performance-move-const-arg <performance/move-const-arg>`, "Yes" diff --git a/clang-tools-extra/docs/clang-tidy/checks/modernize/avoid-c-arrays.rst b/clang-tools-extra/docs/clang-tidy/checks/modernize/avoid-c-arrays.rst index b7a87bf23967b..fec282740dd53 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/modernize/avoid-c-arrays.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/modernize/avoid-c-arrays.rst @@ -5,8 +5,6 @@ modernize-avoid-c-arrays `cppcoreguidelines-avoid-c-arrays` redirects here as an alias for this check. -`hicpp-avoid-c-arrays` redirects here as an alias for this check. - Finds C-style array types and recommend to use ``std::array<>`` / ``std::vector<>``. All types of C arrays are diagnosed. diff --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp/ignored-remove-result.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-remove.cpp similarity index 80% rename from clang-tools-extra/test/clang-tidy/checkers/hicpp/ignored-remove-result.cpp rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-remove.cpp index fc431024303ab..2934db6dd2d2c 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/hicpp/ignored-remove-result.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-remove.cpp @@ -1,5 +1,7 @@ -// RUN: %check_clang_tidy %s hicpp-ignored-remove-result %t -// RUN: %check_clang_tidy -check-suffixes=NOCAST %s hicpp-ignored-remove-result %t -- -config='{CheckOptions: {hicpp-ignored-remove-result.AllowCastToVoid: false}}' +// RUN: %check_clang_tidy %s bugprone-unused-return-value %t -- \ +// RUN: -config='{CheckOptions: {bugprone-unused-return-value.CheckedFunctions: "^::std::remove$;^::std::remove_if$;^::std::unique$", bugprone-unused-return-value.CheckedReturnTypes: "", bugprone-unused-return-value.AllowCastToVoid: true}}' +// RUN: %check_clang_tidy -check-suffixes=NOCAST %s bugprone-unused-return-value %t -- \ +// RUN: -config='{CheckOptions: {bugprone-unused-return-value.CheckedFunctions: "^::std::remove$;^::std::remove_if$;^::std::unique$", bugprone-unused-return-value.CheckedReturnTypes: "", bugprone-unused-return-value.AllowCastToVoid: false}}' namespace std { `````````` </details> https://github.com/llvm/llvm-project/pull/196681 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
