[clang-tools-extra] [llvm] [clang-tidy] Prototype: removing the `IncludeStyle` option (PR #185879)

Wed Mar 11 06:36:44 PDT 2026

llvmbot wrote:




@llvm/pr-subscribers-clang-tidy

Author: Victor Chernyakin (localspook)

<details>
<summary>Changes</summary>

(This PR is mostly to get a dicussion going. I'm not arguing that this exact approach is what we want.)

## Summary

As a baseline, it looks like there's agreement that having `IncludeStyle` be check-local doesn't make sense (see #175283 and https://discourse.llvm.org/t/rfc-global-option-rules-for-clang-tidy/83647). The order of includes is a global property of a file, not something different checks can have different opinions about.

Based on the above, `IncludeStyle` should be made a global option. However, the discussion in #175283 raises the idea of removing `IncludeStyle` entirely, and just relying on clang-format to sort includes. This is the approach this PR prototypes.

## Factors to consider

- We have three hardcoded include styles: `llvm`, `google`, and `google-objc`. The last one is undocumented. Contrast that with clang-format, where users have lots of options for building a custom style:
  - [`SortIncludes`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#sortincludes)
  - [`IncludeCategories`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includecategories)
  - [`IncludeBlocks`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeblocks)
  - [`IncludeIsMainRegex`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeismainregex)
  - [`IncludeIsMainSourceRegex`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeismainsourceregex)
  - [`MainIncludeChar`](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#mainincludechar)

- With the current implementation, the `IncludeStyle` option will become silently ignored (unless running with `-verify-config`). If we don't like this, we can add a warning to tell users "hey, this option doesn't do anything anymore" if they try to set it.

- For downstream check developers using `IncludeInserter`, this will be a build break.

---

If this lands, the next step would be to have just one `IncludeInserter` instance shared across all checks. That'll fix #176225. It's something that could be done even without removing include styles, but will probably be a lot easier if the include style isn't configurable.

---

So: do we want this approach? Are there concerns about specific details?

---

Patch is 66.04 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/185879.diff


53 Files Affected:

- (modified) clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp (+1-1) 
- (modified) clang-tools-extra/clang-tidy/llvm/UseVectorUtilsCheck.cpp (+1-2) 
- (modified) clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp (+1-9) 
- (modified) clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h (-1) 
- (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.cpp (+1-8) 
- (modified) clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h (-1) 
- (modified) clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp (+1-9) 
- (modified) clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h (-1) 
- (modified) clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp (+1-4) 
- (modified) clang-tools-extra/clang-tidy/performance/TypePromotionInMathFnCheck.cpp (+1-9) 
- (modified) clang-tools-extra/clang-tidy/performance/TypePromotionInMathFnCheck.h (-1) 
- (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryValueParamCheck.cpp (+1-5) 
- (modified) clang-tools-extra/clang-tidy/readability/UseStdMinMaxCheck.cpp (+1-8) 
- (modified) clang-tools-extra/clang-tidy/readability/UseStdMinMaxCheck.h (-1) 
- (modified) clang-tools-extra/clang-tidy/utils/CMakeLists.txt (-1) 
- (modified) clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp (+27-37) 
- (modified) clang-tools-extra/clang-tidy/utils/IncludeInserter.h (+12-24) 
- (removed) clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp (-228) 
- (removed) clang-tools-extra/clang-tidy/utils/IncludeSorter.h (-76) 
- (modified) clang-tools-extra/clang-tidy/utils/TransformerClangTidyCheck.cpp (+1-8) 
- (modified) clang-tools-extra/clang-tidy/utils/TransformerClangTidyCheck.h (+1-2) 
- (modified) clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp (+1-8) 
- (modified) clang-tools-extra/clang-tidy/utils/UseRangesCheck.h (-1) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/abseil/string-find-startswith.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/abseil/string-find-str-contains.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/boost/use-ranges.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/init-variables.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/pro-bounds-constant-array-index.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/misc/uniqueptr-reset-release.rst (-8) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/loop-convert.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/make-shared.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/make-unique.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/min-max-use-initializer-list.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/pass-by-value.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/replace-auto-ptr.rst (-8) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/use-integer-sign-comparison.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/use-ranges.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/modernize/use-std-numbers.rst (-5) 
- (modified) clang-tools-extra/docs/clang-tidy/checks/performance/unnecessary-value-param.rst (-5) 
- (modified) clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp (+3-3) 
- (modified) clang-tools-extra/unittests/clang-tidy/IncludeInserterTest.cpp (+1-1) 
- (modified) llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/utils/BUILD.gn (-1) 


``````````diff

diff --git a/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp b/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
index e1063c4f8a46e..3e44ee10b8293 100644
--- a/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
@@ -27,9 +27,7 @@ StringFindStartswithCheck::StringFindStartswithCheck(StringRef Name,
     : ClangTidyCheck(Name, Context),
       StringLikeClasses(utils::options::parseStringList(
           Options.get("StringLikeClasses", DefaultStringLikeClasses))),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()),
+      IncludeInserter(areDiagsSelfContained()),
       AbseilStringsMatchHeader(
           Options.get("AbseilStringsMatchHeader", "absl/strings/match.h")) {}
 
@@ -138,7 +136,6 @@ void StringFindStartswithCheck::storeOptions(
     ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "StringLikeClasses",
                 utils::options::serializeStringList(StringLikeClasses));
-  Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
   Options.store(Opts, "AbseilStringsMatchHeader", AbseilStringsMatchHeader);
 }
 
diff --git a/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
index 7c259a6199832..5ecdb08f35179 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
@@ -43,9 +43,7 @@ ImplicitWideningOfMultiplicationResultCheck::
           Options.get("UseCXXStaticCastsInCppSources", true)),
       UseCXXHeadersInCppSources(Options.get("UseCXXHeadersInCppSources", true)),
       IgnoreConstantIntExpr(Options.get("IgnoreConstantIntExpr", false)),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()) {}
+      IncludeInserter(areDiagsSelfContained()) {}
 
 void ImplicitWideningOfMultiplicationResultCheck::registerPPCallbacks(
     const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
@@ -58,7 +56,6 @@ void ImplicitWideningOfMultiplicationResultCheck::storeOptions(
                 UseCXXStaticCastsInCppSources);
   Options.store(Opts, "UseCXXHeadersInCppSources", UseCXXHeadersInCppSources);
   Options.store(Opts, "IgnoreConstantIntExpr", IgnoreConstantIntExpr);
-  Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
 }
 
 std::optional<FixItHint>
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
index 402ee9efcbc04..99ddd45669adb 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
@@ -25,14 +25,10 @@ AST_MATCHER(VarDecl, isLocalVarDecl) { return Node.isLocalVarDecl(); }
 
 InitVariablesCheck::InitVariablesCheck(StringRef Name,
                                        ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()),
+    : ClangTidyCheck(Name, Context), IncludeInserter(areDiagsSelfContained()),
       MathHeader(Options.get("MathHeader", "<math.h>")) {}
 
 void InitVariablesCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
   Options.store(Opts, "MathHeader", MathHeader);
 }
 
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp
index 82fc9f253ac1c..f34895b47c304 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp
@@ -20,14 +20,11 @@ namespace clang::tidy::cppcoreguidelines {
 ProBoundsConstantArrayIndexCheck::ProBoundsConstantArrayIndexCheck(
     StringRef Name, ClangTidyContext *Context)
     : ClangTidyCheck(Name, Context), GslHeader(Options.get("GslHeader", "")),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()) {}
+      Inserter(areDiagsSelfContained()) {}
 
 void ProBoundsConstantArrayIndexCheck::storeOptions(
     ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "GslHeader", GslHeader);
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
 }
 
 void ProBoundsConstantArrayIndexCheck::registerPPCallbacks(
diff --git a/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp b/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp
index f2267c2549eac..2415cab1d30c0 100644
--- a/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp
@@ -15,7 +15,7 @@ namespace custom {
 // will changed dynamically when switching to different source file.
 static void registerCustomChecks(const ClangTidyOptions &Options,
                                  ClangTidyCheckFactories &Factories) {
-  static llvm::SmallSet<llvm::SmallString<32>, 8> CustomCheckNames{};
+  static llvm::SmallSet<SmallString<32>, 8> CustomCheckNames{};
   if (!Options.CustomChecks.has_value() || Options.CustomChecks->empty())
     return;
   for (const llvm::SmallString<32> &Name : CustomCheckNames)
diff --git a/clang-tools-extra/clang-tidy/llvm/UseVectorUtilsCheck.cpp b/clang-tools-extra/clang-tidy/llvm/UseVectorUtilsCheck.cpp
index bd915eb55b448..9fc176de1f502 100644
--- a/clang-tools-extra/clang-tidy/llvm/UseVectorUtilsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/llvm/UseVectorUtilsCheck.cpp
@@ -17,8 +17,7 @@ namespace clang::tidy::llvm_check {
 
 UseVectorUtilsCheck::UseVectorUtilsCheck(StringRef Name,
                                          ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      Inserter(utils::IncludeSorter::IS_LLVM, areDiagsSelfContained()) {}
+    : ClangTidyCheck(Name, Context), Inserter(areDiagsSelfContained()) {}
 
 void UseVectorUtilsCheck::registerPPCallbacks(const SourceManager &SM,
                                               Preprocessor *PP,
diff --git a/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
index ab2077b304f13..df934b6ab999e 100644
--- a/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
@@ -16,15 +16,7 @@ namespace clang::tidy::misc {
 
 UniqueptrResetReleaseCheck::UniqueptrResetReleaseCheck(
     StringRef Name, ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()) {}
-
-void UniqueptrResetReleaseCheck::storeOptions(
-    ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
-}
+    : ClangTidyCheck(Name, Context), Inserter(areDiagsSelfContained()) {}
 
 void UniqueptrResetReleaseCheck::registerPPCallbacks(
     const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
diff --git a/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h
index cb83ac7b11985..732135a07b1ee 100644
--- a/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h
+++ b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h
@@ -39,7 +39,6 @@ class UniqueptrResetReleaseCheck : public ClangTidyCheck {
                            Preprocessor *ModuleExpanderPP) override;
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
-  void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
 
 private:
   utils::IncludeInserter Inserter;
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
index 2d63da2fef974..433664e528e6d 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -557,9 +557,7 @@ LoopConvertCheck::LoopConvertCheck(StringRef Name, ClangTidyContext *Context)
       MaxCopySize(Options.get("MaxCopySize", 16ULL)),
       MinConfidence(Options.get("MinConfidence", Confidence::CL_Reasonable)),
       NamingStyle(Options.get("NamingStyle", VariableNamer::NS_CamelCase)),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()),
+      Inserter(areDiagsSelfContained()),
       UseCxx20IfAvailable(Options.get("UseCxx20ReverseRanges", true)),
       ReverseFunction(Options.get("MakeReverseRangeFunction", "")),
       ReverseHeader(Options.get("MakeReverseRangeHeader", "")) {
@@ -580,7 +578,6 @@ void LoopConvertCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "MaxCopySize", MaxCopySize);
   Options.store(Opts, "MinConfidence", MinConfidence);
   Options.store(Opts, "NamingStyle", NamingStyle);
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
   Options.store(Opts, "UseCxx20ReverseRanges", UseCxx20IfAvailable);
   Options.store(Opts, "MakeReverseRangeFunction", ReverseFunction);
   Options.store(Opts, "MakeReverseRangeHeader", ReverseHeader);
diff --git a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
index 42a60bb897028..e19da39f41560 100644
--- a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
@@ -35,10 +35,7 @@ static std::string getNewExprName(const CXXNewExpr *NewExpr,
 
 MakeSmartPtrCheck::MakeSmartPtrCheck(StringRef Name, ClangTidyContext *Context,
                                      StringRef MakeSmartPtrFunctionName)
-    : ClangTidyCheck(Name, Context),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()),
+    : ClangTidyCheck(Name, Context), Inserter(areDiagsSelfContained()),
       MakeSmartPtrFunctionHeader(
           Options.get("MakeSmartPtrFunctionHeader", "<memory>")),
       MakeSmartPtrFunctionName(
@@ -48,7 +45,6 @@ MakeSmartPtrCheck::MakeSmartPtrCheck(StringRef Name, ClangTidyContext *Context,
           Options.get("IgnoreDefaultInitialization", true)) {}
 
 void MakeSmartPtrCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
   Options.store(Opts, "MakeSmartPtrFunctionHeader", MakeSmartPtrFunctionHeader);
   Options.store(Opts, "MakeSmartPtrFunction", MakeSmartPtrFunctionName);
   Options.store(Opts, "IgnoreMacros", IgnoreMacros);
diff --git a/clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp b/clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp
index f4592950fc05e..27da146357adc 100644
--- a/clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp
@@ -207,16 +207,13 @@ MinMaxUseInitializerListCheck::MinMaxUseInitializerListCheck(
       IgnoreNonTrivialTypes(Options.get("IgnoreNonTrivialTypes", true)),
       IgnoreTrivialTypesOfSizeAbove(
           Options.get("IgnoreTrivialTypesOfSizeAbove", 32L)),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()) {}
+      Inserter(areDiagsSelfContained()) {}
 
 void MinMaxUseInitializerListCheck::storeOptions(
     ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "IgnoreNonTrivialTypes", IgnoreNonTrivialTypes);
   Options.store(Opts, "IgnoreTrivialTypesOfSizeAbove",
                 IgnoreTrivialTypesOfSizeAbove);
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
 }
 
 void MinMaxUseInitializerListCheck::registerMatchers(MatchFinder *Finder) {
diff --git a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp
index 2619331cba0b0..d932c6ad79ee1 100644
--- a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp
@@ -212,15 +212,11 @@ collectParamDecls(const CXXConstructorDecl *Ctor,
 }
 
 PassByValueCheck::PassByValueCheck(StringRef Name, ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()),
+    : ClangTidyCheck(Name, Context), Inserter(areDiagsSelfContained()),
       ValuesOnly(Options.get("ValuesOnly", false)),
       IgnoreMacros(Options.get("IgnoreMacros", false)) {}
 
 void PassByValueCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
   Options.store(Opts, "ValuesOnly", ValuesOnly);
   Options.store(Opts, "IgnoreMacros", IgnoreMacros);
 }
diff --git a/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.cpp
index 6af05b11bb395..a95da43087136 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.cpp
@@ -39,14 +39,7 @@ AST_MATCHER(Expr, isLValue) { return Node.getValueKind() == VK_LValue; }
 
 ReplaceAutoPtrCheck::ReplaceAutoPtrCheck(StringRef Name,
                                          ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      Inserter(Options.getLocalOrGlobal("IncludeStyle",
-                                        utils::IncludeSorter::IS_LLVM),
-               areDiagsSelfContained()) {}
-
-void ReplaceAutoPtrCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", Inserter.getStyle());
-}
+    : ClangTidyCheck(Name, Context), Inserter(areDiagsSelfContained()) {}
 
 void ReplaceAutoPtrCheck::registerMatchers(MatchFinder *Finder) {
   auto AutoPtrDecl = recordDecl(hasName("auto_ptr"), isInStdNamespace());
diff --git a/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h b/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h
index 18f4740567d53..6bdbcc6fb8c26 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h
@@ -44,7 +44,6 @@ class ReplaceAutoPtrCheck : public ClangTidyCheck {
   bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
     return LangOpts.CPlusPlus11;
   }
-  void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP,
                            Preprocessor *ModuleExpanderPP) override;
diff --git a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
index cfc546a06b40c..711b90748c6ce 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.cpp
@@ -18,10 +18,7 @@ namespace clang::tidy::modernize {
 
 ReplaceRandomShuffleCheck::ReplaceRandomShuffleCheck(StringRef Name,
                                                      ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()) {}
+    : ClangTidyCheck(Name, Context), IncludeInserter(areDiagsSelfContained()) {}
 
 void ReplaceRandomShuffleCheck::registerMatchers(MatchFinder *Finder) {
   const auto Begin = hasArgument(0, expr());
@@ -44,11 +41,6 @@ void ReplaceRandomShuffleCheck::registerPPCallbacks(
   IncludeInserter.registerPreprocessor(PP);
 }
 
-void ReplaceRandomShuffleCheck::storeOptions(
-    ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
-}
-
 void ReplaceRandomShuffleCheck::check(const MatchFinder::MatchResult &Result) {
   const auto *MatchedDecl = Result.Nodes.getNodeAs<DeclRefExpr>("name");
   const auto *MatchedArgumentThree = Result.Nodes.getNodeAs<Expr>("randomFunc");
diff --git a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h
index 3ffa3878bc429..120f80c2fff35 100644
--- a/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/ReplaceRandomShuffleCheck.h
@@ -27,7 +27,6 @@ class ReplaceRandomShuffleCheck : public ClangTidyCheck {
   bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
     return LangOpts.CPlusPlus11;
   }
-  void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 
diff --git a/clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp
index 574cbea46124b..a09b1434e6149 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp
@@ -76,15 +76,11 @@ static StringRef parseOpCode(BinaryOperator::Opcode Code) {
 
 UseIntegerSignComparisonCheck::UseIntegerSignComparisonCheck(
     StringRef Name, ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()),
+    : ClangTidyCheck(Name, Context), IncludeInserter(areDiagsSelfContained()),
       EnableQtSupport(Options.get("EnableQtSupport", false)) {}
 
 void UseIntegerSignComparisonCheck::storeOptions(
     ClangTidyOptions::OptionMap &Opts) {
-  Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
   Options.store(Opts, "EnableQtSupport", EnableQtSupport);
 }
 
diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
index 101780ad0b186..8d0619b4472ae 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseStdFormatCheck.cpp
@@ -28,9 +28,7 @@ UseStdFormatCheck::UseStdFormatCheck(StringRef Name, ClangTidyContext *Context)
           Options.get("StrFormatLikeFunctions", ""))),
       ReplacementFormatFunction(
           Options.get("ReplacementFormatFunction", "std::format")),
-      IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
-                                               utils::IncludeSorter::IS_LLVM),
-                      areDiagsSelfContained()),
+      IncludeInserter(areDiagsSelfContained()),
       MaybeHeaderToInclude(Options.get("FormatHeader")) {
   if (StrFormatLikeFunctions.empty())
     StrFormatLikeFunctions.emplace_back("absl::StrFormat");
@@ -63,7 +61,6 @@ void UseStdFormatCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "StrFormatLikeFunctions",
                 serializeStringList(StrFormatLikeFunctions));
   Options.store(Opts, "ReplacementFormatFunction", ReplacementForma...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/185879
