[clang-tools-extra] [clang-tidy][NFC] Don't qualify names unless strictly necessary (PR #185169)
via cfe-commits
cfe-commits at lists.llvm.org
Sat Mar 7 02:07:38 PST 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang-tools-extra
Author: Victor Chernyakin (localspook)
<details>
<summary>Changes</summary>
We have a de-facto policy in clang-tidy to not qualify names unless absolutely necessary. We're *mostly* consistent about that (especially in new code), but a number of deviations have accumulated over the years. This makes it jarring to read the code and, I imagine, more confusing for newcomers to contribute to the project (do I qualify X or not?). This PR tries to improve the situation and regularize the codebase.
---
Patch is 269.02 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/185169.diff
171 Files Affected:
- (modified) clang-tools-extra/clang-tidy/ClangTidy.cpp (+17-19)
- (modified) clang-tools-extra/clang-tidy/ClangTidy.h (+4-5)
- (modified) clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp (+17-17)
- (modified) clang-tools-extra/clang-tidy/ClangTidyModule.h (+5-5)
- (modified) clang-tools-extra/clang-tidy/ClangTidyOptions.cpp (+9-10)
- (modified) clang-tools-extra/clang-tidy/ClangTidyOptions.h (+14-15)
- (modified) clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/GlobList.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/GlobList.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/NoLintDirectiveHandler.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationAdditionCheck.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationConversionCastCheck.cpp (+2-4)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationFactoryFloatCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationFactoryScaleCheck.cpp (+6-7)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp (+16-16)
- (modified) clang-tools-extra/clang-tidy/abseil/DurationRewriter.h (+7-7)
- (modified) clang-tools-extra/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/abseil/RedundantStrcatCallsCheck.cpp (+7-9)
- (modified) clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/abseil/UncheckedStatusOrAccessCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/abseil/UpgradeDurationConversionsCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/boost/UseRangesCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/ChainedComparisonCheck.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/DerivedMethodShadowingBaseMethodCheck.cpp (+3-5)
- (modified) clang-tools-extra/clang-tidy/bugprone/DynamicStaticInitializersCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.cpp (+1-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/EmptyCatchCheck.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/ForwardingReferenceOverloadCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/IncorrectEnableSharedFromThisCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/ParentVirtualCallCheck.cpp (+2-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/RawMemoryCallOnNonTrivialTypeCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/ReservedIdentifierCheck.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/ReturnConstRefFromParameterCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.h (+3-4)
- (modified) clang-tools-extra/clang-tidy/bugprone/SignedCharMisuseCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/SignedCharMisuseCheck.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/SmartPtrArrayMismatchCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp (+8-10)
- (modified) clang-tools-extra/clang-tidy/bugprone/StdNamespaceModificationCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/bugprone/SuspiciousStringviewDataUsageCheck.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/bugprone/UncheckedOptionalAccessCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/UnsafeFunctionsCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/UnsafeToAllowExceptionsCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/UnusedReturnValueCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/UseAfterMoveCheck.cpp (+8-8)
- (modified) clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp (+178-181)
- (modified) clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccessCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccessCheck.h (+3-3)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h (+1-2)
- (modified) clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/custom/QueryCheck.cpp (+8-8)
- (modified) clang-tools-extra/clang-tidy/custom/QueryCheck.h (+3-4)
- (modified) clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp (+2-3)
- (modified) clang-tools-extra/clang-tidy/google/TodoCommentCheck.cpp (+1-2)
- (modified) clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp (+12-13)
- (modified) clang-tools-extra/clang-tidy/hicpp/IgnoredRemoveResultCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/llvm/UseNewMLIROpBuilderCheck.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/llvmlibc/CalleeNamespaceCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/llvmlibc/InlineFunctionDeclCheck.cpp (+1-2)
- (modified) clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.h (+2-3)
- (modified) clang-tools-extra/clang-tidy/misc/ConfusableTable/BuildConfusableTable.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/misc/HeaderIncludeCycleCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/misc/NewDeleteOverloadsCheck.h (+1-2)
- (modified) clang-tools-extra/clang-tidy/misc/NoRecursionCheck.cpp (+1-2)
- (modified) clang-tools-extra/clang-tidy/misc/OverrideWithDifferentVisibilityCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/misc/UseAnonymousNamespaceCheck.cpp (+2-3)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp (+17-22)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h (+3-3)
- (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h (+42-49)
- (modified) clang-tools-extra/clang-tidy/modernize/MakeUniqueCheck.cpp (+1-2)
- (modified) clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp (+4-6)
- (modified) clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/ReplaceDisallowCopyAndAssignMacroCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/UseDesignatedInitializersCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp (+7-9)
- (modified) clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp (+3-4)
- (modified) clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp (+9-11)
- (modified) clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/modernize/UseStartsEndsWithCheck.cpp (+3-4)
- (modified) clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp (+23-26)
- (modified) clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/UseStringViewCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/UseStructuredBindingCheck.cpp (+11-12)
- (modified) clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp (+6-4)
- (modified) clang-tools-extra/clang-tidy/mpi/BufferDerefCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/objc/AssertEqualsCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp (+7-7)
- (modified) clang-tools-extra/clang-tidy/openmp/ExceptionEscapeCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/performance/AvoidEndlCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/performance/InefficientAlgorithmCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitializationCheck.cpp (+2-3)
- (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryCopyInitializationCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/performance/UnnecessaryValueParamCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/portability/AvoidPragmaOnceCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/portability/RestrictSystemIncludesCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/portability/SIMDIntrinsicsCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/ConstReturnTypeCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp (+4-5)
- (modified) clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/readability/EnumInitialValueCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp (+3-4)
- (modified) clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.h (+13-15)
- (modified) clang-tools-extra/clang-tidy/readability/MakeMemberFunctionConstCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/readability/MathMissingParenthesesCheck.cpp (+6-7)
- (modified) clang-tools-extra/clang-tidy/readability/NamedParameterCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/OperatorsRepresentationCheck.cpp (+14-16)
- (modified) clang-tools-extra/clang-tidy/readability/OperatorsRepresentationCheck.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/readability/ReferenceToConstructedTemporaryCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/readability/UseStdMinMaxCheck.cpp (+13-16)
- (modified) clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp (+5-5)
- (modified) clang-tools-extra/clang-tidy/utils/ASTUtils.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp (+6-6)
- (modified) clang-tools-extra/clang-tidy/utils/DesignatedInitializers.h (+2-2)
- (modified) clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/utils/ExprSequence.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp (+4-7)
- (modified) clang-tools-extra/clang-tidy/utils/FormatStringConverter.cpp (+13-16)
- (modified) clang-tools-extra/clang-tidy/utils/FormatStringConverter.h (+2-3)
- (modified) clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/utils/IncludeInserter.h (+2-3)
- (modified) clang-tools-extra/clang-tidy/utils/Matchers.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/utils/Matchers.h (+4-5)
- (modified) clang-tools-extra/clang-tidy/utils/NamespaceAliaser.h (+2-3)
- (modified) clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp (+1-1)
- (modified) clang-tools-extra/clang-tidy/utils/UseRangesCheck.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/utils/UsingInserter.h (+5-5)
``````````diff
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 7a898ef07b275..e9340ac703cb5 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -362,9 +362,8 @@ ClangTidyASTConsumerFactory::ClangTidyASTConsumerFactory(
}
#if CLANG_TIDY_ENABLE_STATIC_ANALYZER
-static void
-setStaticAnalyzerCheckerOpts(const ClangTidyOptions &Opts,
- clang::AnalyzerOptions &AnalyzerOptions) {
+static void setStaticAnalyzerCheckerOpts(const ClangTidyOptions &Opts,
+ AnalyzerOptions &AnalyzerOptions) {
for (const auto &Opt : Opts.CheckOptions) {
StringRef OptName(Opt.getKey());
if (!OptName.consume_front(AnalyzerCheckNamePrefix))
@@ -409,9 +408,9 @@ static CheckersList getAnalyzerCheckersAndPackages(ClangTidyContext &Context,
}
#endif // CLANG_TIDY_ENABLE_STATIC_ANALYZER
-std::unique_ptr<clang::ASTConsumer>
-ClangTidyASTConsumerFactory::createASTConsumer(
- clang::CompilerInstance &Compiler, StringRef File) {
+std::unique_ptr<ASTConsumer>
+ClangTidyASTConsumerFactory::createASTConsumer(CompilerInstance &Compiler,
+ StringRef File) {
// FIXME: Move this to a separate method, so that CreateASTConsumer doesn't
// modify Compiler.
SourceManager *SM = &Compiler.getSourceManager();
@@ -516,10 +515,10 @@ ClangTidyOptions::OptionMap ClangTidyASTConsumerFactory::getCheckOptions() {
std::vector<std::string> getCheckNames(const ClangTidyOptions &Options,
bool AllowEnablingAnalyzerAlphaCheckers,
bool ExperimentalCustomChecks) {
- clang::tidy::ClangTidyContext Context(
- std::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(),
- Options),
- AllowEnablingAnalyzerAlphaCheckers, false, ExperimentalCustomChecks);
+ ClangTidyContext Context(std::make_unique<DefaultOptionsProvider>(
+ ClangTidyGlobalOptions(), Options),
+ AllowEnablingAnalyzerAlphaCheckers, false,
+ ExperimentalCustomChecks);
ClangTidyASTConsumerFactory Factory(Context);
return Factory.getCheckNames();
}
@@ -542,10 +541,10 @@ ClangTidyOptions::OptionMap
getCheckOptions(const ClangTidyOptions &Options,
bool AllowEnablingAnalyzerAlphaCheckers,
bool ExperimentalCustomChecks) {
- clang::tidy::ClangTidyContext Context(
- std::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(),
- Options),
- AllowEnablingAnalyzerAlphaCheckers, false, ExperimentalCustomChecks);
+ ClangTidyContext Context(std::make_unique<DefaultOptionsProvider>(
+ ClangTidyGlobalOptions(), Options),
+ AllowEnablingAnalyzerAlphaCheckers, false,
+ ExperimentalCustomChecks);
ClangTidyDiagnosticConsumer DiagConsumer(Context);
auto DiagOpts = std::make_unique<DiagnosticOptions>();
DiagnosticsEngine DE(llvm::makeIntrusiveRefCnt<DiagnosticIDs>(), *DiagOpts,
@@ -556,12 +555,11 @@ getCheckOptions(const ClangTidyOptions &Options,
}
std::vector<ClangTidyError>
-runClangTidy(clang::tidy::ClangTidyContext &Context,
- const CompilationDatabase &Compilations,
+runClangTidy(ClangTidyContext &Context, const CompilationDatabase &Compilations,
ArrayRef<std::string> InputFiles,
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> BaseFS,
bool ApplyAnyFix, bool EnableCheckProfile,
- llvm::StringRef StoreCheckProfile, bool Quiet) {
+ StringRef StoreCheckProfile, bool Quiet) {
ClangTool Tool(Compilations, InputFiles,
std::make_shared<PCHContainerOperations>(), BaseFS);
@@ -685,7 +683,7 @@ void handleErrors(llvm::ArrayRef<ClangTidyError> Errors,
WarningsAsErrorsCount += Reporter.getWarningsAsErrorsCount();
}
-void exportReplacements(const llvm::StringRef MainFilePath,
+void exportReplacements(const StringRef MainFilePath,
const std::vector<ClangTidyError> &Errors,
raw_ostream &OS) {
TranslationUnitDiagnostics TUD;
@@ -706,7 +704,7 @@ ChecksAndOptions getAllChecksAndOptions(bool AllowEnablingAnalyzerAlphaCheckers,
ChecksAndOptions Result;
ClangTidyOptions Opts;
Opts.Checks = "*";
- clang::tidy::ClangTidyContext Context(
+ ClangTidyContext Context(
std::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(), Opts),
AllowEnablingAnalyzerAlphaCheckers, false, ExperimentalCustomChecks);
ClangTidyCheckFactories Factories;
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h
index e238f2357caeb..5fac25bd3bbca 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.h
+++ b/clang-tools-extra/clang-tidy/ClangTidy.h
@@ -38,8 +38,8 @@ class ClangTidyASTConsumerFactory {
IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFS = nullptr);
/// Returns an ASTConsumer that runs the specified clang-tidy checks.
- std::unique_ptr<clang::ASTConsumer>
- createASTConsumer(clang::CompilerInstance &Compiler, StringRef File);
+ std::unique_ptr<ASTConsumer> createASTConsumer(CompilerInstance &Compiler,
+ StringRef File);
/// Get the list of enabled checks.
std::vector<std::string> getCheckNames();
@@ -91,13 +91,12 @@ void filterCheckOptions(ClangTidyOptions &Options,
/// the profile will not be output to stderr, but will instead be stored
/// as a JSON file in the specified directory.
std::vector<ClangTidyError>
-runClangTidy(clang::tidy::ClangTidyContext &Context,
+runClangTidy(ClangTidyContext &Context,
const tooling::CompilationDatabase &Compilations,
ArrayRef<std::string> InputFiles,
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> BaseFS,
bool ApplyAnyFix, bool EnableCheckProfile = false,
- llvm::StringRef StoreCheckProfile = StringRef(),
- bool Quiet = false);
+ StringRef StoreCheckProfile = {}, bool Quiet = false);
/// Controls what kind of fixes clang-tidy is allowed to apply.
enum FixBehaviour {
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
index 337d660b1f93b..f7232645a329c 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -510,57 +510,57 @@ void ClangTidyDiagnosticConsumer::forwardDiagnostic(const Diagnostic &Info) {
for (unsigned Index = 0; Index < Info.getNumArgs(); ++Index) {
const DiagnosticsEngine::ArgumentKind Kind = Info.getArgKind(Index);
switch (Kind) {
- case clang::DiagnosticsEngine::ak_std_string:
+ case DiagnosticsEngine::ak_std_string:
Builder << Info.getArgStdStr(Index);
break;
- case clang::DiagnosticsEngine::ak_c_string:
+ case DiagnosticsEngine::ak_c_string:
Builder << Info.getArgCStr(Index);
break;
- case clang::DiagnosticsEngine::ak_sint:
+ case DiagnosticsEngine::ak_sint:
Builder << Info.getArgSInt(Index);
break;
- case clang::DiagnosticsEngine::ak_uint:
+ case DiagnosticsEngine::ak_uint:
Builder << Info.getArgUInt(Index);
break;
- case clang::DiagnosticsEngine::ak_tokenkind:
+ case DiagnosticsEngine::ak_tokenkind:
Builder << static_cast<tok::TokenKind>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_identifierinfo:
+ case DiagnosticsEngine::ak_identifierinfo:
Builder << Info.getArgIdentifier(Index);
break;
- case clang::DiagnosticsEngine::ak_qual:
+ case DiagnosticsEngine::ak_qual:
Builder << Qualifiers::fromOpaqueValue(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_qualtype:
+ case DiagnosticsEngine::ak_qualtype:
Builder << QualType::getFromOpaquePtr(
reinterpret_cast<void *>(Info.getRawArg(Index)));
break;
- case clang::DiagnosticsEngine::ak_declarationname:
+ case DiagnosticsEngine::ak_declarationname:
Builder << DeclarationName::getFromOpaqueInteger(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_nameddecl:
+ case DiagnosticsEngine::ak_nameddecl:
Builder << reinterpret_cast<const NamedDecl *>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_nestednamespec:
+ case DiagnosticsEngine::ak_nestednamespec:
Builder << NestedNameSpecifier::getFromVoidPointer(
reinterpret_cast<void *>(Info.getRawArg(Index)));
break;
- case clang::DiagnosticsEngine::ak_declcontext:
+ case DiagnosticsEngine::ak_declcontext:
Builder << reinterpret_cast<DeclContext *>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_qualtype_pair:
+ case DiagnosticsEngine::ak_qualtype_pair:
assert(false); // This one is not passed around.
break;
- case clang::DiagnosticsEngine::ak_attr:
+ case DiagnosticsEngine::ak_attr:
Builder << reinterpret_cast<Attr *>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_attr_info:
+ case DiagnosticsEngine::ak_attr_info:
Builder << reinterpret_cast<AttributeCommonInfo *>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_addrspace:
+ case DiagnosticsEngine::ak_addrspace:
Builder << static_cast<LangAS>(Info.getRawArg(Index));
break;
- case clang::DiagnosticsEngine::ak_expr:
+ case DiagnosticsEngine::ak_expr:
Builder << reinterpret_cast<const Expr *>(Info.getRawArg(Index));
}
}
diff --git a/clang-tools-extra/clang-tidy/ClangTidyModule.h b/clang-tools-extra/clang-tidy/ClangTidyModule.h
index c2d623540999b..3db92c2dab981 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyModule.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyModule.h
@@ -28,12 +28,12 @@ class ClangTidyContext;
class ClangTidyCheckFactories {
public:
using CheckFactory = std::function<std::unique_ptr<ClangTidyCheck>(
- llvm::StringRef Name, ClangTidyContext *Context)>;
+ StringRef Name, ClangTidyContext *Context)>;
/// Registers check \p Factory with name \p Name.
///
/// For all checks that have default constructors, use \c registerCheck.
- void registerCheckFactory(llvm::StringRef Name, CheckFactory Factory);
+ void registerCheckFactory(StringRef Name, CheckFactory Factory);
/// Registers the \c CheckType with the name \p Name.
///
@@ -56,14 +56,14 @@ class ClangTidyCheckFactories {
/// }
/// };
/// \endcode
- template <typename CheckType> void registerCheck(llvm::StringRef CheckName) {
+ template <typename CheckType> void registerCheck(StringRef CheckName) {
registerCheckFactory(CheckName,
- [](llvm::StringRef Name, ClangTidyContext *Context) {
+ [](StringRef Name, ClangTidyContext *Context) {
return std::make_unique<CheckType>(Name, Context);
});
}
- void eraseCheck(llvm::StringRef CheckName) { Factories.erase(CheckName); }
+ void eraseCheck(StringRef CheckName) { Factories.erase(CheckName); }
/// Create instances of checks that are enabled.
std::vector<std::unique_ptr<ClangTidyCheck>>
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
index 317fbd9173af7..0a0f392346f6d 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
@@ -324,8 +324,7 @@ ClangTidyOptions ClangTidyOptions::merge(const ClangTidyOptions &Other,
return Result;
}
-ClangTidyOptions
-ClangTidyOptionsProvider::getOptions(llvm::StringRef FileName) {
+ClangTidyOptions ClangTidyOptionsProvider::getOptions(StringRef FileName) {
ClangTidyOptions Result;
unsigned Priority = 0;
for (auto &Source : getRawOptions(FileName))
@@ -334,7 +333,7 @@ ClangTidyOptionsProvider::getOptions(llvm::StringRef FileName) {
}
std::vector<OptionsSource>
-DefaultOptionsProvider::getRawOptions(llvm::StringRef FileName) {
+DefaultOptionsProvider::getRawOptions(StringRef FileName) {
std::vector<OptionsSource> Result;
Result.emplace_back(DefaultOptions, OptionsSourceTypeDefaultBinary);
return Result;
@@ -350,14 +349,14 @@ ConfigOptionsProvider::ConfigOptionsProvider(
ConfigOptions(std::move(ConfigOptions)) {}
std::vector<OptionsSource>
-ConfigOptionsProvider::getRawOptions(llvm::StringRef FileName) {
+ConfigOptionsProvider::getRawOptions(StringRef FileName) {
std::vector<OptionsSource> RawOptions =
DefaultOptionsProvider::getRawOptions(FileName);
if (ConfigOptions.InheritParentConfig.value_or(false)) {
LLVM_DEBUG(llvm::dbgs()
<< "Getting options for file " << FileName << "...\n");
- llvm::ErrorOr<llvm::SmallString<128>> AbsoluteFilePath =
+ llvm::ErrorOr<SmallString<128>> AbsoluteFilePath =
getNormalizedAbsolutePath(FileName);
if (AbsoluteFilePath)
addRawFileOptions(AbsoluteFilePath->str(), RawOptions);
@@ -390,10 +389,10 @@ FileOptionsBaseProvider::FileOptionsBaseProvider(
OverrideOptions(std::move(OverrideOptions)),
ConfigHandlers(std::move(ConfigHandlers)) {}
-llvm::ErrorOr<llvm::SmallString<128>>
-FileOptionsBaseProvider::getNormalizedAbsolutePath(llvm::StringRef Path) {
+llvm::ErrorOr<SmallString<128>>
+FileOptionsBaseProvider::getNormalizedAbsolutePath(StringRef Path) {
assert(FS && "FS must be set.");
- llvm::SmallString<128> NormalizedAbsolutePath = {Path};
+ SmallString<128> NormalizedAbsolutePath = {Path};
const std::error_code Err = FS->makeAbsolute(NormalizedAbsolutePath);
if (Err)
return Err;
@@ -402,7 +401,7 @@ FileOptionsBaseProvider::getNormalizedAbsolutePath(llvm::StringRef Path) {
}
void FileOptionsBaseProvider::addRawFileOptions(
- llvm::StringRef AbsolutePath, std::vector<OptionsSource> &CurOptions) {
+ StringRef AbsolutePath, std::vector<OptionsSource> &CurOptions) {
auto CurSize = CurOptions.size();
// Look for a suitable configuration file in all parent directories of the
// file. Start with the immediate parent directory and move up.
@@ -465,7 +464,7 @@ FileOptionsProvider::getRawOptions(StringRef FileName) {
LLVM_DEBUG(llvm::dbgs() << "Getting options for file " << FileName
<< "...\n");
- const llvm::ErrorOr<llvm::SmallString<128>> AbsoluteFilePath =
+ const llvm::ErrorOr<SmallString<128>> AbsoluteFilePath =
getNormalizedAbsolutePath(FileName);
if (!AbsoluteFilePath)
return {};
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.h b/clang-tools-extra/clang-tidy/ClangTidyOptions.h
index 23bbfb01c2ecd..73fdbabd5bdba 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyOptions.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.h
@@ -116,7 +116,7 @@ struct ClangTidyOptions {
struct ClangTidyValue {
ClangTidyValue() = default;
ClangTidyValue(const char *Value) : Value(Value) {}
- ClangTidyValue(llvm::StringRef Value, unsigned Priority = 0)
+ ClangTidyValue(StringRef Value, unsigned Priority = 0)
: Value(Value), Priority(Priority) {}
std::string Value;
@@ -138,9 +138,9 @@ struct ClangTidyOptions {
struct CustomCheckValue {
std::string Name;
std::string Query;
- llvm::SmallVector<CustomCheckDiag> Diags;
+ SmallVector<CustomCheckDiag> Diags;
};
- using CustomCheckValueList = llvm::SmallVector<CustomCheckValue>;
+ using CustomCheckValueList = SmallVector<CustomCheckValue>;
std::optional<CustomCheckValueList> CustomChecks;
using ArgList = std::vector<std::string>;
@@ -193,12 +193,11 @@ class ClangTidyOptionsProvider {
/// Returns an ordered vector of OptionsSources, in order of increasing
/// priority.
- virtual std::vector<OptionsSource>
- getRawOptions(llvm::StringRef FileName) = 0;
+ virtual std::vector<OptionsSource> getRawOptions(StringRef FileName) = 0;
/// Returns options applying to a specific translation unit with the
/// specified \p FileName.
- ClangTidyOptions getOptions(llvm::StringRef FileName);
+ ClangTidyOptions getOptions(StringRef FileName);
};
/// Implementation of the \c ClangTidyOptionsProvider interface, which
@@ -212,7 +211,7 @@ class DefaultOptionsProvider : public ClangTidyOptionsProvider {
const ClangTidyGlobalOptions &getGlobalOptions() override {
return GlobalOptions;
}
- std::vector<OptionsSource> getRawOptions(llvm::StringRef FileName) override;
+ std::vector<OptionsSource> getRawOptions(StringRef FileName) override;
private:
ClangTidyGlobalOptions GlobalOptions;
@@ -256,19 +255,19 @@ class FileOptionsBaseProvider : public DefaultOptionsProvider {
ClangTidyOptions OverrideOptions,
ConfigFileHandlers ConfigHandlers);
- void addRawFileOptions(llvm::StringRef AbsolutePath,
+ void addRawFileOptions(StringRef AbsolutePath,
std::vector<OptionsSource> &CurOptions);
- llvm::ErrorOr<llvm::SmallString<128>>
- getNormalizedAbsolutePath(llvm::StringRef AbsolutePath);
+ llvm::ErrorOr<SmallString<128>>
+ getNormalizedAbsolutePath(StringRef AbsolutePath);
/// Try to read configuration files from \p Directory using registered
/// \c ConfigHandlers.
- std::optional<OptionsSource> tryReadConfigFile(llvm::StringRef Directory);
+ std::optional<OptionsSource> tryReadConfigFile(StringRef Directory);
struct OptionsCache {
llvm::StringMap<size_t> Memorized;
- llvm::SmallVector<OptionsSource, 4U> Storage;
+ SmallVector<OptionsSource, 4U> Storage;
} CachedOptions;
ClangTidyOptions OverrideOptions;
ConfigFileHandlers ConfigHandlers;
@@ -283,7 +282,7 @@ class ConfigOptionsProvider : public FileOptionsBaseProvider {
ClangTidyGlobalOptions GlobalOptions, ClangTidyOptions DefaultOptions,
ClangTidyOptions ConfigOptions, ClangTidyOptions OverrideOptions,
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS = nullptr);
- std::vector<OptionsSource> getRawOptions(llvm::StringRef FileName) override;
+ std::vector<OptionsSource> getRawOptions(StringRef FileName) override;
private:
ClangTidyOptions ConfigOptions;
@@ -336,11 +335,11 @@ class FileOptionsProvider : public FileOptionsBaseProvider {
ClangTidyOptions OverrideOptions,
ConfigFileHandlers ConfigHandlers);
- std::vector<OptionsSource> getRawOptions(llvm::StringRef FileName) override;
+ std::vector<OptionsSource> getRawOptions(StringRef FileName) override;
};
/// Parses LineFilter from JSON and stores it to the \p Options.
-std::error_code parseLineFilter(llvm::StringRef LineFilter,
+std::error_code parseLineFilter(StringRef LineFilter,
ClangTidyGlobalOptions &Options);
/// Parses configuration from JSON and returns \c ClangTidyOptions or an
diff --git a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp
index 8a865f1352599..cb6de9962956d 100644
--- a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp
+++ b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp
@@ -88,11 +88,11 @@ ExpandModularHeadersPPCallbacks::ExpandModularHeadersPPCallbacks(
HeaderInfo = std::make_unique<HeaderSearch>(HSOpts, Sources, Diags, LangOpts,
&Compiler.getTarget());
- PP = std::make_unique<clang::Preprocessor>(Compiler.getPreprocessorOpts(),
- Diags, LangOpts, Sources,
- *HeaderInfo, ModuleLoader,
- /*IILookup=*/nullptr,
- /*OwnsHeaderSearch=*/false);
+ PP = std::make_unique<Preprocessor>(Compiler.getPreprocessorOpts(), Diags,
+ LangOpts, Sources, *HeaderInfo,
+ ModuleLoader,
+ ...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/185169
More information about the cfe-commits
mailing list