https://github.com/localspook updated https://github.com/llvm/llvm-project/pull/173231
>From d33b4ac234ff774b689da26cb215be74faf28b13 Mon Sep 17 00:00:00 2001 From: Victor Chernyakin <[email protected]> Date: Mon, 22 Dec 2025 03:38:00 -0700 Subject: [PATCH 1/3] [clang-tidy] Merge `ClangTidyModuleRegistry.h` into `ClangTidyModule.h` --- clang-tools-extra/clang-tidy/ClangTidy.cpp | 2 +- clang-tools-extra/clang-tidy/ClangTidyModule.h | 7 +++++++ .../clang-tidy/ClangTidyModuleRegistry.h | 13 ++++--------- clang-tools-extra/clang-tidy/ClangTidyOptions.cpp | 2 +- .../clang-tidy/abseil/AbseilTidyModule.cpp | 1 - .../clang-tidy/altera/AlteraTidyModule.cpp | 1 - .../clang-tidy/android/AndroidTidyModule.cpp | 1 - .../clang-tidy/boost/BoostTidyModule.cpp | 1 - .../clang-tidy/bugprone/BugproneTidyModule.cpp | 1 - .../clang-tidy/cert/CERTTidyModule.cpp | 1 - .../concurrency/ConcurrencyTidyModule.cpp | 1 - .../CppCoreGuidelinesTidyModule.cpp | 1 - .../clang-tidy/custom/CustomTidyModule.cpp | 1 - .../clang-tidy/darwin/DarwinTidyModule.cpp | 1 - .../clang-tidy/fuchsia/FuchsiaTidyModule.cpp | 1 - .../clang-tidy/google/GoogleTidyModule.cpp | 1 - .../clang-tidy/hicpp/HICPPTidyModule.cpp | 1 - .../linuxkernel/LinuxKernelTidyModule.cpp | 1 - .../clang-tidy/llvm/LLVMTidyModule.cpp | 1 - .../clang-tidy/llvmlibc/LLVMLibcTidyModule.cpp | 1 - .../clang-tidy/misc/MiscTidyModule.cpp | 1 - .../clang-tidy/modernize/ModernizeTidyModule.cpp | 1 - clang-tools-extra/clang-tidy/mpi/MPITidyModule.cpp | 1 - .../clang-tidy/objc/ObjCTidyModule.cpp | 1 - .../clang-tidy/openmp/OpenMPTidyModule.cpp | 1 - .../performance/PerformanceTidyModule.cpp | 1 - .../portability/PortabilityTidyModule.cpp | 1 - .../readability/ReadabilityTidyModule.cpp | 1 - .../clang-tidy/zircon/ZirconTidyModule.cpp | 1 - clang-tools-extra/clangd/ParsedAST.cpp | 1 - clang-tools-extra/clangd/TidyProvider.cpp | 2 +- clang-tools-extra/clangd/tool/Check.cpp | 1 - .../clangd/unittests/ReplayPeambleTests.cpp | 1 - clang-tools-extra/docs/clang-tidy/Contributing.rst | 1 - .../test/clang-tidy/CTTestTidyModule.cpp | 1 - 35 files changed, 14 insertions(+), 42 deletions(-) diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index e52794feedd2d3..da2b4e577c9ed7 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -17,7 +17,7 @@ #include "ClangTidy.h" #include "ClangTidyCheck.h" #include "ClangTidyDiagnosticConsumer.h" -#include "ClangTidyModuleRegistry.h" +#include "ClangTidyModule.h" #include "ClangTidyProfiling.h" #include "ExpandModularHeadersPPCallbacks.h" #include "clang-tidy-config.h" diff --git a/clang-tools-extra/clang-tidy/ClangTidyModule.h b/clang-tools-extra/clang-tidy/ClangTidyModule.h index 53ef3f153dd15f..c2d623540999bc 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyModule.h +++ b/clang-tools-extra/clang-tidy/ClangTidyModule.h @@ -12,6 +12,7 @@ #include "ClangTidyOptions.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" +#include "llvm/Support/Registry.h" #include <functional> #include <memory> @@ -95,6 +96,12 @@ class ClangTidyModule { virtual ClangTidyOptions getModuleOptions(); }; +using ClangTidyModuleRegistry = llvm::Registry<ClangTidyModule>; + } // namespace clang::tidy +namespace llvm { +extern template class Registry<clang::tidy::ClangTidyModule>; +} // namespace llvm + #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYMODULE_H diff --git a/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h b/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h index e0e5e35d4dae06..ba34a91a198a1e 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h +++ b/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h @@ -9,17 +9,12 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYMODULEREGISTRY_H #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYMODULEREGISTRY_H -#include "ClangTidyModule.h" -#include "llvm/Support/Registry.h" - -namespace clang::tidy { +// NOLINTBEGIN -using ClangTidyModuleRegistry = llvm::Registry<ClangTidyModule>; +#warning The ClangTidyModuleRegistry.h header is deprecated and will be removed in LLVM 24. All of the symbols it used to define have been moved into ClangTidyModule.h. -} // namespace clang::tidy +#include "ClangTidyModule.h" -namespace llvm { -extern template class Registry<clang::tidy::ClangTidyModule>; -} // namespace llvm +// NOLINTEND #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYMODULEREGISTRY_H diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp index 9aa679a9bf8d37..adb7017ff464ae 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "ClangTidyOptions.h" -#include "ClangTidyModuleRegistry.h" +#include "ClangTidyModule.h" #include "clang/Basic/DiagnosticIDs.h" #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" diff --git a/clang-tools-extra/clang-tidy/abseil/AbseilTidyModule.cpp b/clang-tools-extra/clang-tidy/abseil/AbseilTidyModule.cpp index e00e88dc76a7f5..4b8ec48ebd78ce 100644 --- a/clang-tools-extra/clang-tidy/abseil/AbseilTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/abseil/AbseilTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "CleanupCtadCheck.h" #include "DurationAdditionCheck.h" #include "DurationComparisonCheck.h" diff --git a/clang-tools-extra/clang-tidy/altera/AlteraTidyModule.cpp b/clang-tools-extra/clang-tidy/altera/AlteraTidyModule.cpp index c29a3be5653323..5a382783ad5bdf 100644 --- a/clang-tools-extra/clang-tidy/altera/AlteraTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/altera/AlteraTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "IdDependentBackwardBranchCheck.h" #include "KernelNameRestrictionCheck.h" #include "SingleWorkItemBarrierCheck.h" diff --git a/clang-tools-extra/clang-tidy/android/AndroidTidyModule.cpp b/clang-tools-extra/clang-tidy/android/AndroidTidyModule.cpp index 6b48ec152838c0..ff2abc286efcbf 100644 --- a/clang-tools-extra/clang-tidy/android/AndroidTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/android/AndroidTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "CloexecAccept4Check.h" #include "CloexecAcceptCheck.h" #include "CloexecCreatCheck.h" diff --git a/clang-tools-extra/clang-tidy/boost/BoostTidyModule.cpp b/clang-tools-extra/clang-tidy/boost/BoostTidyModule.cpp index 859c25e3366ebd..2f0c6b318168f5 100644 --- a/clang-tools-extra/clang-tidy/boost/BoostTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/boost/BoostTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "UseRangesCheck.h" #include "UseToStringCheck.h" using namespace clang::ast_matchers; diff --git a/clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp b/clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp index 61a680a72a0273..4150442c25d61c 100644 --- a/clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "ArgumentCommentCheck.h" #include "AssertSideEffectCheck.h" #include "AssignmentInIfConditionCheck.h" diff --git a/clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp b/clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp index 2d73e1e7c2e45e..c14e5c8076377b 100644 --- a/clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../bugprone/BadSignalToKillThreadCheck.h" #include "../bugprone/CommandProcessorCheck.h" #include "../bugprone/CopyConstructorMutatesArgumentCheck.h" diff --git a/clang-tools-extra/clang-tidy/concurrency/ConcurrencyTidyModule.cpp b/clang-tools-extra/clang-tidy/concurrency/ConcurrencyTidyModule.cpp index dc40734fba88df..0d02a3d9b6e2bf 100644 --- a/clang-tools-extra/clang-tidy/concurrency/ConcurrencyTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/concurrency/ConcurrencyTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "MtUnsafeCheck.h" #include "ThreadCanceltypeAsynchronousCheck.h" diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp index f2d0f5e63172b5..fab4f92be22b65 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../bugprone/NarrowingConversionsCheck.h" #include "../misc/NonPrivateMemberVariablesInClassesCheck.h" #include "../misc/UnconventionalAssignOperatorCheck.h" diff --git a/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp b/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp index 2f354f77723e4d..f2267c2549eac3 100644 --- a/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp @@ -1,6 +1,5 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../ClangTidyOptions.h" #include "QueryCheck.h" #include "llvm/ADT/SmallSet.h" diff --git a/clang-tools-extra/clang-tidy/darwin/DarwinTidyModule.cpp b/clang-tools-extra/clang-tidy/darwin/DarwinTidyModule.cpp index 9aa236b4745137..6c8fc2327ae82e 100644 --- a/clang-tools-extra/clang-tidy/darwin/DarwinTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/darwin/DarwinTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AvoidSpinlockCheck.h" #include "DispatchOnceNonstaticCheck.h" diff --git a/clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp b/clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp index 81d067a4d27c88..62cb24f2510da8 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/FuchsiaTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../google/UnnamedNamespaceInHeaderCheck.h" #include "../misc/MultipleInheritanceCheck.h" #include "DefaultArgumentsCallsCheck.h" diff --git a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp index f2931822182323..b20e07a4b5e2ce 100644 --- a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../modernize/AvoidCStyleCastCheck.h" #include "../readability/BracesAroundStatementsCheck.h" #include "../readability/FunctionSizeCheck.h" diff --git a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp index 9acd293bcf6529..2e0e64fbcd2a16 100644 --- a/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/hicpp/HICPPTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../bugprone/UndelegatedConstructorCheck.h" #include "../bugprone/UseAfterMoveCheck.h" #include "../cppcoreguidelines/AvoidGotoCheck.h" diff --git a/clang-tools-extra/clang-tidy/linuxkernel/LinuxKernelTidyModule.cpp b/clang-tools-extra/clang-tidy/linuxkernel/LinuxKernelTidyModule.cpp index b3abc08ac7fc41..a3f22177bdde74 100644 --- a/clang-tools-extra/clang-tidy/linuxkernel/LinuxKernelTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/linuxkernel/LinuxKernelTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "MustCheckErrsCheck.h" namespace clang::tidy { diff --git a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp index acc942a125e113..56c6db05e9792f 100644 --- a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../readability/ElseAfterReturnCheck.h" #include "../readability/NamespaceCommentCheck.h" #include "../readability/QualifiedAutoCheck.h" diff --git a/clang-tools-extra/clang-tidy/llvmlibc/LLVMLibcTidyModule.cpp b/clang-tools-extra/clang-tidy/llvmlibc/LLVMLibcTidyModule.cpp index bc0220ea721c0d..2ba27e82fe2177 100644 --- a/clang-tools-extra/clang-tidy/llvmlibc/LLVMLibcTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/llvmlibc/LLVMLibcTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "CalleeNamespaceCheck.h" #include "ImplementationInNamespaceCheck.h" #include "InlineFunctionDeclCheck.h" diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp index 3f8d47a15a4d6d..7894ae667f168c 100644 --- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "ConfusableIdentifierCheck.h" #include "ConstCorrectnessCheck.h" #include "CoroutineHostileRAIICheck.h" diff --git a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp index 7224b2f32fd731..800639c6cea16c 100644 --- a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AvoidBindCheck.h" #include "AvoidCArraysCheck.h" #include "AvoidCStyleCastCheck.h" diff --git a/clang-tools-extra/clang-tidy/mpi/MPITidyModule.cpp b/clang-tools-extra/clang-tidy/mpi/MPITidyModule.cpp index 577411e134bd4d..4f2348db45e9bc 100644 --- a/clang-tools-extra/clang-tidy/mpi/MPITidyModule.cpp +++ b/clang-tools-extra/clang-tidy/mpi/MPITidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "BufferDerefCheck.h" #include "TypeMismatchCheck.h" diff --git a/clang-tools-extra/clang-tidy/objc/ObjCTidyModule.cpp b/clang-tools-extra/clang-tidy/objc/ObjCTidyModule.cpp index 1764f6876ef1da..db92ca3e9f664d 100644 --- a/clang-tools-extra/clang-tidy/objc/ObjCTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/objc/ObjCTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AssertEqualsCheck.h" #include "AvoidNSErrorInitCheck.h" #include "DeallocInCategoryCheck.h" diff --git a/clang-tools-extra/clang-tidy/openmp/OpenMPTidyModule.cpp b/clang-tools-extra/clang-tidy/openmp/OpenMPTidyModule.cpp index 3f2d72b28c2dc4..e5296baa24381a 100644 --- a/clang-tools-extra/clang-tidy/openmp/OpenMPTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/openmp/OpenMPTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "ExceptionEscapeCheck.h" #include "UseDefaultNoneCheck.h" diff --git a/clang-tools-extra/clang-tidy/performance/PerformanceTidyModule.cpp b/clang-tools-extra/clang-tidy/performance/PerformanceTidyModule.cpp index 3914a6af90239f..6bab1a46d18dbd 100644 --- a/clang-tools-extra/clang-tidy/performance/PerformanceTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/performance/PerformanceTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AvoidEndlCheck.h" #include "EnumSizeCheck.h" #include "FasterStringFindCheck.h" diff --git a/clang-tools-extra/clang-tidy/portability/PortabilityTidyModule.cpp b/clang-tools-extra/clang-tidy/portability/PortabilityTidyModule.cpp index 9ff0883f5f3759..fda997a2a3df68 100644 --- a/clang-tools-extra/clang-tidy/portability/PortabilityTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/portability/PortabilityTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AvoidPragmaOnceCheck.h" #include "RestrictSystemIncludesCheck.h" #include "SIMDIntrinsicsCheck.h" diff --git a/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp b/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp index 85b4fa322b263c..6126de747782f3 100644 --- a/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "AmbiguousSmartptrResetCallCheck.h" #include "AvoidConstParamsInDeclsCheck.h" #include "AvoidNestedConditionalOperatorCheck.h" diff --git a/clang-tools-extra/clang-tidy/zircon/ZirconTidyModule.cpp b/clang-tools-extra/clang-tidy/zircon/ZirconTidyModule.cpp index 84e5c61120253d..9cec7e5bd5551d 100644 --- a/clang-tools-extra/clang-tidy/zircon/ZirconTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/zircon/ZirconTidyModule.cpp @@ -8,7 +8,6 @@ #include "../ClangTidy.h" #include "../ClangTidyModule.h" -#include "../ClangTidyModuleRegistry.h" #include "../fuchsia/TemporaryObjectsCheck.h" namespace clang::tidy { diff --git a/clang-tools-extra/clangd/ParsedAST.cpp b/clang-tools-extra/clangd/ParsedAST.cpp index 48896e5f4ff876..c23b5d7a38d37a 100644 --- a/clang-tools-extra/clangd/ParsedAST.cpp +++ b/clang-tools-extra/clangd/ParsedAST.cpp @@ -10,7 +10,6 @@ #include "../clang-tidy/ClangTidyCheck.h" #include "../clang-tidy/ClangTidyDiagnosticConsumer.h" #include "../clang-tidy/ClangTidyModule.h" -#include "../clang-tidy/ClangTidyModuleRegistry.h" #include "../clang-tidy/ClangTidyOptions.h" #include "AST.h" #include "CollectMacros.h" diff --git a/clang-tools-extra/clangd/TidyProvider.cpp b/clang-tools-extra/clangd/TidyProvider.cpp index 1d79a7a7399ec7..801b3af2fbdd50 100644 --- a/clang-tools-extra/clangd/TidyProvider.cpp +++ b/clang-tools-extra/clangd/TidyProvider.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "TidyProvider.h" -#include "../clang-tidy/ClangTidyModuleRegistry.h" +#include "../clang-tidy/ClangTidyModule.h" #include "../clang-tidy/ClangTidyOptions.h" #include "Config.h" #include "support/FileCache.h" diff --git a/clang-tools-extra/clangd/tool/Check.cpp b/clang-tools-extra/clangd/tool/Check.cpp index 9c6de40ebde0ff..03c4f58a49c9cb 100644 --- a/clang-tools-extra/clangd/tool/Check.cpp +++ b/clang-tools-extra/clangd/tool/Check.cpp @@ -25,7 +25,6 @@ //===----------------------------------------------------------------------===// #include "../clang-tidy/ClangTidyModule.h" -#include "../clang-tidy/ClangTidyModuleRegistry.h" #include "../clang-tidy/ClangTidyOptions.h" #include "../clang-tidy/GlobList.h" #include "ClangdLSPServer.h" diff --git a/clang-tools-extra/clangd/unittests/ReplayPeambleTests.cpp b/clang-tools-extra/clangd/unittests/ReplayPeambleTests.cpp index 32942e6bbfdc8f..3200b6b3cb98db 100644 --- a/clang-tools-extra/clangd/unittests/ReplayPeambleTests.cpp +++ b/clang-tools-extra/clangd/unittests/ReplayPeambleTests.cpp @@ -13,7 +13,6 @@ #include "../../clang-tidy/ClangTidyCheck.h" #include "../../clang-tidy/ClangTidyModule.h" -#include "../../clang-tidy/ClangTidyModuleRegistry.h" #include "AST.h" #include "Config.h" #include "Diagnostics.h" diff --git a/clang-tools-extra/docs/clang-tidy/Contributing.rst b/clang-tools-extra/docs/clang-tidy/Contributing.rst index e738e42e3c6a8a..72444480ece0e8 100644 --- a/clang-tools-extra/docs/clang-tidy/Contributing.rst +++ b/clang-tools-extra/docs/clang-tidy/Contributing.rst @@ -96,7 +96,6 @@ The Directory Structure |-- ClangTidy.h # Interfaces for users. |-- ClangTidyCheck.h # Interfaces for checks. |-- ClangTidyModule.h # Interface for clang-tidy modules. - |-- ClangTidyModuleRegistry.h # Interface for registering of modules. ... |-- google/ # Google clang-tidy module. |-+ diff --git a/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp b/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp index 19ea46d9b3ded0..c41e1fa6965a91 100644 --- a/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp +++ b/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp @@ -10,7 +10,6 @@ #include "clang-tidy/ClangTidy.h" #include "clang-tidy/ClangTidyCheck.h" #include "clang-tidy/ClangTidyModule.h" -#include "clang-tidy/ClangTidyModuleRegistry.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" >From 36b95f4ad75c381a47293bc583f4b5efa1e0f9fc Mon Sep 17 00:00:00 2001 From: Victor Chernyakin <[email protected]> Date: Tue, 23 Dec 2025 12:23:11 -0700 Subject: [PATCH 2/3] Add TODO note --- clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h | 1 + 1 file changed, 1 insertion(+) diff --git a/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h b/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h index ba34a91a198a1e..39aecd955ef732 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h +++ b/clang-tools-extra/clang-tidy/ClangTidyModuleRegistry.h @@ -11,6 +11,7 @@ // NOLINTBEGIN +// TODO(LLVM 24) Delete this header. #warning The ClangTidyModuleRegistry.h header is deprecated and will be removed in LLVM 24. All of the symbols it used to define have been moved into ClangTidyModule.h. #include "ClangTidyModule.h" >From 3000a0276339042d839234cc73ac93b601709396 Mon Sep 17 00:00:00 2001 From: Victor Chernyakin <[email protected]> Date: Tue, 23 Dec 2025 12:25:09 -0700 Subject: [PATCH 3/3] Add potentially breaking changes note --- clang-tools-extra/docs/ReleaseNotes.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index e4ff640811933a..79b928f1624036 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -86,6 +86,10 @@ Potentially Breaking Changes `-header-filter='.*'`. To disable warnings from non-system, set `-header-filter` to an empty string. +- The ``clang-tidy/ClangTidyModuleRegistry.h`` header has been deprecated and will + be removed in LLVM 24. All of the symbols it used to define have been moved into + ``clang-tidy/ClangTidyModule.h``. + Improvements to clangd ---------------------- _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
