From 45ddc157ca7c464ebbea627da0f682b1554e2390 Mon Sep 17 00:00:00 2001 From: Carlos Galvez Date: Sun, 12 Feb 2023 10:58:37 +0000 Subject: [PATCH] [clang-tidy][NFC] Remove ModernizeTidyModule::getModuleOptions Most of the options stated there are duplicated already in the implementation of each check as a default value for each option. The only place where this is not the case is the nullptr check. Move the default option there instead. Only the HICPP guidelines alias this modernize check, and there is nothing in the documentation that suggests it should have a different default value than the main modernize check. Differential Revision: https://reviews.llvm.org/D143843 --- .../clang-tidy/modernize/ModernizeTidyModule.cpp | 17 ----------------- .../clang-tidy/modernize/UseNullptrCheck.cpp | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp index 97d24e5..9f116f9 100644 --- a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp @@ -100,23 +100,6 @@ public: "modernize-use-uncaught-exceptions"); CheckFactories.registerCheck("modernize-use-using"); } - - ClangTidyOptions getModuleOptions() override { - ClangTidyOptions Options; - auto &Opts = Options.CheckOptions; - // For types whose size in bytes is above this threshold, we prefer taking a - // const-reference than making a copy. - Opts["modernize-loop-convert.MaxCopySize"] = "16"; - - Opts["modernize-loop-convert.MinConfidence"] = "reasonable"; - Opts["modernize-loop-convert.NamingStyle"] = "CamelCase"; - Opts["modernize-pass-by-value.IncludeStyle"] = "llvm"; // Also: "google". - Opts["modernize-replace-auto-ptr.IncludeStyle"] = "llvm"; // Also: "google". - - // Comma-separated list of macros that behave like NULL. - Opts["modernize-use-nullptr.NullMacros"] = "NULL"; - return Options; - } }; // Register the ModernizeTidyModule using this statically initialized variable. diff --git a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp index 9270334..47c6478 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp @@ -480,7 +480,7 @@ private: UseNullptrCheck::UseNullptrCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context), - NullMacrosStr(Options.get("NullMacros", "")) { + NullMacrosStr(Options.get("NullMacros", "NULL")) { StringRef(NullMacrosStr).split(NullMacros, ","); } -- 2.7.4