diff options
| author | Mandeep Singh Grang <mgrang@codeaurora.org> | 2016-11-08 07:50:19 +0000 |
|---|---|---|
| committer | Mandeep Singh Grang <mgrang@codeaurora.org> | 2016-11-08 07:50:19 +0000 |
| commit | 5242a87b7665f03c2cb314f35401c707c72f1543 (patch) | |
| tree | 8530ce29edf222c67baafa4fb5cf35ff72d679c2 | |
| parent | 9234817c638eda1885bbb2c546b5219baa889f69 (diff) | |
[clang-tools-extra] Format sources with clang-format. NFC.
Summary:
Ran clang-format on all .c/.cpp/.h files in clang-tools-extra.
Excluded the test, unittests, clang-reorder-fields, include-fixer, modularize and pptrace directories.
Reviewers: klimek, alexfh
Subscribers: nemanjai
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D26329
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@286221 91177308-0d34-0410-b5e6-96231b3b80d8
114 files changed, 410 insertions, 479 deletions
diff --git a/change-namespace/ChangeNamespace.cpp b/change-namespace/ChangeNamespace.cpp index 4157e4df..02ba3e81 100644 --- a/change-namespace/ChangeNamespace.cpp +++ b/change-namespace/ChangeNamespace.cpp @@ -345,7 +345,8 @@ void ChangeNamespaceTool::run( } else if (const auto *TLoc = Result.Nodes.getNodeAs<TypeLoc>("type")) { fixTypeLoc(Result, startLocationForType(*TLoc), EndLocationForType(*TLoc), *TLoc); - } else if (const auto *VarRef = Result.Nodes.getNodeAs<DeclRefExpr>("var_ref")){ + } else if (const auto *VarRef = + Result.Nodes.getNodeAs<DeclRefExpr>("var_ref")) { const auto *Var = Result.Nodes.getNodeAs<VarDecl>("var_decl"); assert(Var); if (Var->getCanonicalDecl()->isStaticDataMember()) @@ -358,8 +359,8 @@ void ChangeNamespaceTool::run( VarRefRange.getEnd(), Name); } else { const auto *Call = Result.Nodes.getNodeAs<clang::CallExpr>("call"); - assert(Call != nullptr &&"Expecting callback for CallExpr."); - const clang::FunctionDecl* Func = Call->getDirectCallee(); + assert(Call != nullptr && "Expecting callback for CallExpr."); + const clang::FunctionDecl *Func = Call->getDirectCallee(); assert(Func != nullptr); // Ignore out-of-line static methods since they will be handled by nested // name specifiers. @@ -548,7 +549,8 @@ void ChangeNamespaceTool::fixUsingShadowDecl( const UsingDecl *UsingDeclaration) { SourceLocation Start = UsingDeclaration->getLocStart(); SourceLocation End = UsingDeclaration->getLocEnd(); - if (Start.isInvalid() || End.isInvalid()) return; + if (Start.isInvalid() || End.isInvalid()) + return; assert(UsingDeclaration->shadow_size() > 0); // FIXME: it might not be always accurate to use the first using-decl. diff --git a/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h b/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h index 395b51b4..22393724 100644 --- a/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h +++ b/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h @@ -38,8 +38,7 @@ namespace replace { typedef std::vector<clang::tooling::Range> RangeVector; /// \brief Collection of TranslationUnitReplacements. -typedef std::vector<clang::tooling::TranslationUnitReplacements> -TUReplacements; +typedef std::vector<clang::tooling::TranslationUnitReplacements> TUReplacements; /// \brief Collection of TranslationUnitReplacement files. typedef std::vector<std::string> TUReplacementFiles; @@ -66,11 +65,9 @@ typedef llvm::DenseMap<const clang::FileEntry *, /// /// \returns An error_code indicating success or failure in navigating the /// directory structure. -std::error_code -collectReplacementsFromDirectory(const llvm::StringRef Directory, - TUReplacements &TUs, - TUReplacementFiles &TURFiles, - clang::DiagnosticsEngine &Diagnostics); +std::error_code collectReplacementsFromDirectory( + const llvm::StringRef Directory, TUReplacements &TUs, + TUReplacementFiles &TURFiles, clang::DiagnosticsEngine &Diagnostics); /// \brief Deduplicate, check for conflicts, and apply all Replacements stored /// in \c TUs. If conflicts occur, no Replacements are applied. @@ -115,7 +112,7 @@ bool applyReplacements(const FileToReplacementsMap &GroupedReplacements, /// \pre Replacements[i].getOffset() <= Replacements[i+1].getOffset(). /// /// \param[in] Replacements Replacements from a single file. -/// +/// /// \returns Collection of source ranges that enclose all given Replacements. /// One range is created for each replacement. RangeVector calculateChangedRanges( diff --git a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp index ce66402a..3fb21c5d 100644 --- a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -30,17 +30,14 @@ using namespace llvm; using namespace clang; - static void eatDiagnostics(const SMDiagnostic &, void *) {} namespace clang { namespace replace { -std::error_code -collectReplacementsFromDirectory(const llvm::StringRef Directory, - TUReplacements &TUs, - TUReplacementFiles & TURFiles, - clang::DiagnosticsEngine &Diagnostics) { +std::error_code collectReplacementsFromDirectory( + const llvm::StringRef Directory, TUReplacements &TUs, + TUReplacementFiles &TURFiles, clang::DiagnosticsEngine &Diagnostics) { using namespace llvm::sys::fs; using namespace llvm::sys::path; @@ -128,7 +125,7 @@ bool applyAllReplacements(const std::vector<tooling::Replacement> &Replaces, Rewriter &Rewrite) { bool Result = true; for (std::vector<tooling::Replacement>::const_iterator I = Replaces.begin(), - E = Replaces.end(); + E = Replaces.end(); I != E; ++I) { if (I->isApplicable()) { Result = I->apply(Rewrite) && Result; @@ -139,11 +136,10 @@ bool applyAllReplacements(const std::vector<tooling::Replacement> &Replaces, return Result; } - // FIXME: moved from libToolingCore. remove this when std::vector<Replacement> // is replaced with tooling::Replacements class. static void deduplicate(std::vector<tooling::Replacement> &Replaces, - std::vector<tooling::Range> &Conflicts) { + std::vector<tooling::Range> &Conflicts) { if (Replaces.empty()) return; diff --git a/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index fd7979df..48c6903f 100644 --- a/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -43,7 +43,6 @@ static cl::opt<bool> RemoveTUReplacementFiles( "merging/replacing."), cl::init(false), cl::cat(ReplacementCategory)); - static cl::opt<bool> DoFormat( "format", cl::desc("Enable formatting of code changed by applying replacements.\n" @@ -63,8 +62,8 @@ static cl::opt<std::string> FormatStyleConfig( cl::init(""), cl::cat(FormattingCategory)); static cl::opt<std::string> -FormatStyleOpt("style", cl::desc(format::StyleOptionHelpDescription), - cl::init("LLVM"), cl::cat(FormattingCategory)); + FormatStyleOpt("style", cl::desc(format::StyleOptionHelpDescription), + cl::init("LLVM"), cl::cat(FormattingCategory)); namespace { // Helper object to remove the TUReplacement files (triggered by @@ -75,9 +74,7 @@ public: clang::DiagnosticsEngine &Diagnostics) : TURFiles(Files), Diag(Diagnostics) {} - ~ScopedFileRemover() { - deleteReplacementFiles(TURFiles, Diag); - } + ~ScopedFileRemover() { deleteReplacementFiles(TURFiles, Diag); } private: const TUReplacementFiles &TURFiles; @@ -106,7 +103,8 @@ static void printVersion() { static bool getRewrittenData(const std::vector<tooling::Replacement> &Replacements, Rewriter &Rewrites, std::string &Result) { - if (Replacements.empty()) return true; + if (Replacements.empty()) + return true; if (!applyAllReplacements(Replacements, Rewrites)) return false; @@ -206,8 +204,7 @@ int main(int argc, char **argv) { IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions()); DiagnosticsEngine Diagnostics( - IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), - DiagOpts.get()); + IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), DiagOpts.get()); // Determine a formatting style from options. format::FormatStyle FormatStyle; diff --git a/clang-move/ClangMove.cpp b/clang-move/ClangMove.cpp index dea41b2c..6a7dea83 100644 --- a/clang-move/ClangMove.cpp +++ b/clang-move/ClangMove.cpp @@ -25,14 +25,13 @@ namespace move { namespace { // FIXME: Move to ASTMatchers. -AST_MATCHER(VarDecl, isStaticDataMember) { - return Node.isStaticDataMember(); -} +AST_MATCHER(VarDecl, isStaticDataMember) { return Node.isStaticDataMember(); } AST_MATCHER_P(Decl, hasOutermostEnclosingClass, ast_matchers::internal::Matcher<Decl>, InnerMatcher) { - const auto* Context = Node.getDeclContext(); - if (!Context) return false; + const auto *Context = Node.getDeclContext(); + if (!Context) + return false; while (const auto *NextContext = Context->getParent()) { if (isa<NamespaceDecl>(NextContext) || isa<TranslationUnitDecl>(NextContext)) @@ -46,7 +45,8 @@ AST_MATCHER_P(Decl, hasOutermostEnclosingClass, AST_MATCHER_P(CXXMethodDecl, ofOutermostEnclosingClass, ast_matchers::internal::Matcher<CXXRecordDecl>, InnerMatcher) { const CXXRecordDecl *Parent = Node.getParent(); - if (!Parent) return false; + if (!Parent) + return false; while (const auto *NextParent = dyn_cast<CXXRecordDecl>(Parent->getParent())) { Parent = NextParent; @@ -64,7 +64,7 @@ std::string MakeAbsolutePath(StringRef CurrentDir, StringRef Path) { llvm::SmallString<128> AbsolutePath(Path); if (std::error_code EC = llvm::sys::fs::make_absolute(InitialDirectory, AbsolutePath)) - llvm::errs() << "Warning: could not make absolute file: '" << EC.message() + llvm::errs() << "Warning: could not make absolute file: '" << EC.message() << '\n'; llvm::sys::path::remove_dots(AbsolutePath, /*remove_dot_dot=*/true); llvm::sys::path::native(AbsolutePath); @@ -76,16 +76,17 @@ std::string MakeAbsolutePath(StringRef CurrentDir, StringRef Path) { // // The Path can be a path relative to the build directory, or retrieved from // the SourceManager. -std::string MakeAbsolutePath(const SourceManager& SM, StringRef Path) { +std::string MakeAbsolutePath(const SourceManager &SM, StringRef Path) { llvm::SmallString<128> AbsolutePath(Path); if (std::error_code EC = - SM.getFileManager().getVirtualFileSystem()->makeAbsolute(AbsolutePath)) - llvm::errs() << "Warning: could not make absolute file: '" << EC.message() + SM.getFileManager().getVirtualFileSystem()->makeAbsolute( + AbsolutePath)) + llvm::errs() << "Warning: could not make absolute file: '" << EC.message() << '\n'; // Handle symbolic link path cases. // We are trying to get the real file path of the symlink. const DirectoryEntry *Dir = SM.getFileManager().getDirectory( - llvm::sys::path::parent_path(AbsolutePath.str())); + llvm::sys::path::parent_path(AbsolutePath.str())); if (Dir) { StringRef DirName = SM.getFileManager().getCanonicalName(Dir); SmallVector<char, 128> AbsoluteFilename; @@ -156,7 +157,7 @@ getLocForEndOfDecl(const clang::Decl *D, const SourceManager *SM, // FIXME: this is a bit hacky to get ReadToEndOfLine work. Lex.setParsingPreprocessorDirective(true); Lex.ReadToEndOfLine(&Line); - SourceLocation EndLoc = D->getLocEnd().getLocWithOffset(Line.size()); + SourceLocation EndLoc = D->getLocEnd().getLocWithOffset(Line.size()); // If we already reach EOF, just return the EOF SourceLocation; // otherwise, move 1 offset ahead to include the trailing newline character // '\n'. @@ -172,14 +173,12 @@ GetFullRange(const clang::SourceManager *SM, const clang::Decl *D, clang::SourceRange Full = D->getSourceRange(); Full.setEnd(getLocForEndOfDecl(D, SM)); // Expand to comments that are associated with the Decl. - if (const auto* Comment = - D->getASTContext().getRawCommentForDeclNoCache(D)) { + if (const auto *Comment = D->getASTContext().getRawCommentForDeclNoCache(D)) { if (SM->isBeforeInTranslationUnit(Full.getEnd(), Comment->getLocEnd())) Full.setEnd(Comment->getLocEnd()); // FIXME: Don't delete a preceding comment, if there are no other entities // it could refer to. - if (SM->isBeforeInTranslationUnit(Comment->getLocStart(), - Full.getBegin())) + if (SM->isBeforeInTranslationUnit(Comment->getLocStart(), Full.getBegin())) Full.setBegin(Comment->getLocStart()); } @@ -228,8 +227,7 @@ std::vector<std::string> GetNamespaces(const clang::Decl *D) { clang::tooling::Replacements createInsertedReplacements(const std::vector<std::string> &Includes, const std::vector<ClangMoveTool::MovedDecl> &Decls, - llvm::StringRef FileName, - bool IsHeader = false) { + llvm::StringRef FileName, bool IsHeader = false) { std::string NewCode; std::string GuardName(FileName); if (IsHeader) { @@ -325,8 +323,8 @@ void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) { auto InOldHeader = isExpansionInFile( MakeAbsolutePath(OriginalRunningDirectory, Spec.OldHeader)); - auto InOldCC = isExpansionInFile( - MakeAbsolutePath(OriginalRunningDirectory, Spec.OldCC)); + auto InOldCC = + isExpansionInFile(MakeAbsolutePath(OriginalRunningDirectory, Spec.OldCC)); auto InOldFiles = anyOf(InOldHeader, InOldCC); auto InMovedClass = hasOutermostEnclosingClass(cxxRecordDecl(*InMovedClassNames)); @@ -346,10 +344,10 @@ void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) { this); // Match static member variable definition of the moved class. - Finder->addMatcher(varDecl(InMovedClass, InOldCC, isDefinition(), - isStaticDataMember()) - .bind("class_static_var_decl"), - this); + Finder->addMatcher( + varDecl(InMovedClass, InOldCC, isDefinition(), isStaticDataMember()) + .bind("class_static_var_decl"), + this); auto InOldCCNamedNamespace = allOf(hasParent(namespaceDecl(unless(isAnonymous()))), InOldCC); @@ -357,10 +355,9 @@ void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) { // in classes, functions and anonymous namespaces are covered in other // matchers. Finder->addMatcher( - namedDecl( - anyOf(usingDecl(InOldCCNamedNamespace), - usingDirectiveDecl(InOldCC, InOldCCNamedNamespace), - typeAliasDecl(InOldCC, InOldCCNamedNamespace))) + namedDecl(anyOf(usingDecl(InOldCCNamedNamespace), + usingDirectiveDecl(InOldCC, InOldCCNamedNamespace), + typeAliasDecl(InOldCC, InOldCCNamedNamespace))) .bind("using_decl"), this); @@ -373,11 +370,10 @@ void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) { auto IsOldCCStaticDefinition = allOf(isDefinition(), unless(InMovedClass), InOldCCNamedNamespace, isStaticStorageClass()); - Finder->addMatcher( - namedDecl(anyOf(functionDecl(IsOldCCStaticDefinition), - varDecl(IsOldCCStaticDefinition))) - .bind("static_decls"), - this); + Finder->addMatcher(namedDecl(anyOf(functionDecl(IsOldCCStaticDefinition), + varDecl(IsOldCCStaticDefinition))) + .bind("static_decls"), + this); // Match forward declarations in old header. Finder->addMatcher( @@ -413,8 +409,8 @@ void ClangMoveTool::run(const ast_matchers::MatchFinder::MatchResult &Result) { MovedDecls.emplace_back(FWD, &Result.Context->getSourceManager()); } } - } else if (const auto *ANS = Result.Nodes.getNodeAs<clang::NamespaceDecl>( - "anonymous_ns")) { + } else if (const auto *ANS = + Result.Nodes.getNodeAs<clang::NamespaceDecl>("anonymous_ns")) { MovedDecls.emplace_back(ANS, &Result.Context->getSourceManager()); } else if (const auto *ND = Result.Nodes.getNodeAs<clang::NamedDecl>("static_decls")) { @@ -425,11 +421,10 @@ void ClangMoveTool::run(const ast_matchers::MatchFinder::MatchResult &Result) { } } -void ClangMoveTool::addIncludes(llvm::StringRef IncludeHeader, - bool IsAngled, +void ClangMoveTool::addIncludes(llvm::StringRef IncludeHeader, bool IsAngled, llvm::StringRef SearchPath, llvm::StringRef FileName, - const SourceManager& SM) { + const SourceManager &SM) { SmallVector<char, 128> HeaderWithSearchPath; llvm::sys::path::append(HeaderWithSearchPath, SearchPath, IncludeHeader); std::string AbsoluteOldHeader = @@ -460,8 +455,8 @@ void ClangMoveTool::removeClassDefinitionInOldFiles() { const auto &SM = *MovedDecl.SM; auto Range = GetFullRange(&SM, MovedDecl.Decl); clang::tooling::Replacement RemoveReplacement( - *MovedDecl.SM, clang::CharSourceRange::getCharRange( - Range.getBegin(), Range.getEnd()), + *MovedDecl.SM, + clang::CharSourceRange::getCharRange(Range.getBegin(), Range.getEnd()), ""); std::string FilePath = RemoveReplacement.getFilePath().str(); auto Err = FileToReplacements[FilePath].add(RemoveReplacement); diff --git a/clang-move/ClangMove.h b/clang-move/ClangMove.h index 4427c483..7cef7ec2 100644 --- a/clang-move/ClangMove.h +++ b/clang-move/ClangMove.h @@ -69,11 +69,9 @@ public: /// in the file system. It can be a relative path or an absolute path. /// \param FileName The name of file where the IncludeHeader comes from. /// \param SM The SourceManager. - void addIncludes(llvm::StringRef IncludeHeader, - bool IsAngled, - llvm::StringRef SearchPath, - llvm::StringRef FileName, - const SourceManager& SM); + void addIncludes(llvm::StringRef IncludeHeader, bool IsAngled, + llvm::StringRef SearchPath, llvm::StringRef FileName, + const SourceManager &SM); private: void removeClassDefinitionInOldFiles(); diff --git a/clang-move/tool/ClangMoveMain.cpp b/clang-move/tool/ClangMoveMain.cpp index b79ff311..016c56f4 100644 --- a/clang-move/tool/ClangMoveMain.cpp +++ b/clang-move/tool/ClangMoveMain.cpp @@ -77,8 +77,8 @@ int main(int argc, const char **argv) { // Add "-fparse-all-comments" compile option to make clang parse all comments, // otherwise, ordinary comments like "//" and "/*" won't get parsed (This is // a bit of hacky). - std::vector<std::string> ExtraArgs( argv, argv + argc ); - ExtraArgs.insert(ExtraArgs.begin()+1, "-extra-arg=-fparse-all-comments"); + std::vector<std::string> ExtraArgs(argv, argv + argc); + ExtraArgs.insert(ExtraArgs.begin() + 1, "-extra-arg=-fparse-all-comments"); std::unique_ptr<const char *[]> RawExtraArgs( new const char *[ExtraArgs.size()]); for (size_t i = 0; i < ExtraArgs.size(); ++i) @@ -90,7 +90,7 @@ int main(int argc, const char **argv) { tooling::RefactoringTool Tool(OptionsParser.getCompilations(), OptionsParser.getSourcePathList()); move::ClangMoveTool::MoveDefinitionSpec Spec; - Spec.Names = { Names.begin(), Names.end() }; + Spec.Names = {Names.begin(), Names.end()}; Spec.OldHeader = OldHeader; Spec.NewHeader = NewHeader; Spec.OldCC = OldCC; diff --git a/clang-query/Query.cpp b/clang-query/Query.cpp index 74eb6ea4..ed27c211 100644 --- a/clang-query/Query.cpp +++ b/clang-query/Query.cpp @@ -65,7 +65,7 @@ struct CollectBoundNodes : MatchFinder::MatchCallback { } }; -} // namespace +} // namespace bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const { unsigned MatchCount = 0; @@ -100,11 +100,10 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const { if (R.isValid()) { TextDiagnostic TD(OS, AST->getASTContext().getLangOpts(), &AST->getDiagnostics().getDiagnosticOptions()); - TD.emitDiagnostic( - R.getBegin(), DiagnosticsEngine::Note, - "\"" + BI->first + "\" binds here", - CharSourceRange::getTokenRange(R), - None, &AST->getSourceManager()); + TD.emitDiagnostic(R.getBegin(), DiagnosticsEngine::Note, + "\"" + BI->first + "\" binds here", + CharSourceRange::getTokenRange(R), None, + &AST->getSourceManager()); } break; } diff --git a/clang-query/Query.h b/clang-query/Query.h index 109336a9..b8c59cb3 100644 --- a/clang-query/Query.h +++ b/clang-query/Query.h @@ -18,11 +18,7 @@ namespace clang { namespace query { -enum OutputKind { - OK_Diag, - OK_Print, - OK_Dump -}; +enum OutputKind { OK_Diag, OK_Print, OK_Dump }; enum QueryKind { QK_Invalid, diff --git a/clang-query/QueryParser.cpp b/clang-query/QueryParser.cpp index e25b6970..15d6bbc1 100644 --- a/clang-query/QueryParser.cpp +++ b/clang-query/QueryParser.cpp @@ -76,9 +76,7 @@ template <typename T> struct QueryParser::LexOrCompleteWord { return *this; } - T Default(const T& Value) const { - return Switch.Default(Value); - } + T Default(const T &Value) const { return Switch.Default(Value); } }; // Lexes a word and stores it in Word. Returns a LexOrCompleteWord<T> object @@ -101,9 +99,9 @@ QueryParser::lexOrCompleteWord(StringRef &Word) { QueryRef QueryParser::parseSetBool(bool QuerySession::*Var) { StringRef ValStr; unsigned Value = lexOrCompleteWord<unsigned>(ValStr) - .Case("false", 0) - .Case("true", 1) - .Default(~0u); + .Case("false", 0) + .Case("true", 1) + .Default(~0u); if (Value == ~0u) { return new InvalidQuery("expected 'true' or 'false', got '" + ValStr + "'"); } @@ -145,11 +143,7 @@ enum ParsedQueryKind { PQK_Quit }; -enum ParsedQueryVariable { - PQV_Invalid, - PQV_Output, - PQV_BindRoot -}; +enum ParsedQueryVariable { PQV_Invalid, PQV_Output, PQV_BindRoot }; QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) { std::string ErrStr; @@ -158,7 +152,7 @@ QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) { return new InvalidQuery(OS.str()); } -} // namespace +} // namespace QueryRef QueryParser::completeMatcherExpression() { std::vector<MatcherCompletion> Comps = Parser::completeExpression( diff --git a/clang-query/QueryParser.h b/clang-query/QueryParser.h index a43f84da..20591815 100644 --- a/clang-query/QueryParser.h +++ b/clang-query/QueryParser.h @@ -37,8 +37,7 @@ public: private: QueryParser(StringRef Line, const QuerySession &QS) - : Begin(Line.begin()), End(Line.end()), - CompletionPos(nullptr), QS(QS) {} + : Begin(Line.begin()), End(Line.end()), CompletionPos(nullptr), QS(QS) {} StringRef lexWord(); diff --git a/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tidy/ClangTidyDiagnosticConsumer.cpp index a58d32df..df05e7df 100644 --- a/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -83,7 +83,7 @@ protected: // applied). if (Err) { llvm::errs() << "Fix conflicts with existing fix! " - << llvm::toString(std::move(Err)) << "\n"; + << llvm::toString(std::move(Err)) << "\n"; assert(false && "Fix conflicts with existing fix!"); } } @@ -124,10 +124,9 @@ ClangTidyMessage::ClangTidyMessage(StringRef Message, ClangTidyError::ClangTidyError(StringRef CheckName, ClangTidyError::Level DiagLevel, - bool IsWarningAsError, - StringRef BuildDirectory) - : CheckName(CheckName), BuildDirectory(BuildDirectory), DiagLevel(DiagLevel), - IsWarningAsError(IsWarningAsError) {} + bool IsWarningAsError, StringRef BuildDirectory) + : CheckName(CheckName), BuildDirectory(BuildDirectory), + DiagLevel(DiagLevel), IsWarningAsError(IsWarningAsError) {} // Returns true if GlobList starts with the negative indicator ('-'), removes it // from the GlobList. @@ -279,7 +278,7 @@ void ClangTidyDiagnosticConsumer::finalizeLastError() { LastErrorPassesLineFilter = false; } -static bool LineIsMarkedWithNOLINT(SourceManager& SM, SourceLocation Loc) { +static bool LineIsMarkedWithNOLINT(SourceManager &SM, SourceLocation Loc) { bool Invalid; const char *CharacterData = SM.getCharacterData(Loc, &Invalid); if (!Invalid) { @@ -312,10 +311,10 @@ void ClangTidyDiagnosticConsumer::HandleDiagnostic( if (LastErrorWasIgnored && DiagLevel == DiagnosticsEngine::Note) return; - if (Info.getLocation().isValid() && - DiagLevel != DiagnosticsEngine::Error && + if (Info.getLocation().isValid() && DiagLevel != DiagnosticsEngine::Error && DiagLevel != DiagnosticsEngine::Fatal && - LineIsMarkedWithNOLINTinMacro(Diags->getSourceManager(), Info.getLocation())) { + LineIsMarkedWithNOLINTinMacro(Diags->getSourceManager(), + Info.getLocation())) { ++Context.Stats.ErrorsIgnoredNOLINT; // Ignored a warning, should ignore related notes as well LastErrorWasIgnored = true; diff --git a/clang-tidy/ClangTidyModule.h b/clang-tidy/ClangTidyModule.h index 58e833c0..47216368 100644 --- a/clang-tidy/ClangTidyModule.h +++ b/clang-tidy/ClangTidyModule.h @@ -26,8 +26,9 @@ namespace tidy { /// this object. class ClangTidyCheckFactories { public: - typedef std::function<ClangTidyCheck *( - StringRef Name, ClangTidyContext *Context)> CheckFactory; + typedef std::function<ClangTidyCheck *(StringRef Name, + ClangTidyContext *Context)> + CheckFactory; /// \brief Registers check \p Factory with name \p Name. /// @@ -58,8 +59,8 @@ public: template <typename CheckType> void registerCheck(StringRef CheckName) { registerCheckFactory(CheckName, [](StringRef Name, ClangTidyContext *Context) { - return new CheckType(Name, Context); - }); + return new CheckType(Name, Context); + }); } /// \brief Create instances of all checks matching \p CheckRegexString and diff --git a/clang-tidy/ClangTidyOptions.cpp b/clang-tidy/ClangTidyOptions.cpp index 116fc52a..8d7665e1 100644 --- a/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tidy/ClangTidyOptions.cpp @@ -215,8 +215,7 @@ FileOptionsProvider::FileOptionsProvider( const ClangTidyOptions &OverrideOptions, const FileOptionsProvider::ConfigFileHandlers &ConfigHandlers) : DefaultOptionsProvider(GlobalOptions, DefaultOptions), - OverrideOptions(OverrideOptions), ConfigHandlers(ConfigHandlers) { -} + OverrideOptions(OverrideOptions), ConfigHandlers(ConfigHandlers) {} // FIXME: This method has some common logic with clang::format::getStyle(). // Consider pulling out common bits to a findParentFileWithName function or diff --git a/clang-tidy/ClangTidyOptions.h b/clang-tidy/ClangTidyOptions.h index 74a483fc..a3924435 100644 --- a/clang-tidy/ClangTidyOptions.h +++ b/clang-tidy/ClangTidyOptions.h @@ -173,7 +173,8 @@ public: // \brief A pair of configuration file base name and a function parsing // configuration from text in the corresponding format. typedef std::pair<std::string, std::function<llvm::ErrorOr<ClangTidyOptions>( - llvm::StringRef)>> ConfigFileHandler; + llvm::StringRef)>> + ConfigFileHandler; /// \brief Configuration file handlers listed in the order of priority. /// diff --git a/clang-tidy/cert/CERTTidyModule.cpp b/clang-tidy/cert/CERTTidyModule.cpp index 71135378..d88825be 100644 --- a/clang-tidy/cert/CERTTidyModule.cpp +++ b/clang-tidy/cert/CERTTidyModule.cpp @@ -34,8 +34,7 @@ public: void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { // C++ checkers // DCL - CheckFactories.registerCheck<VariadicFunctionDefCheck>( - "cert-dcl50-cpp"); + CheckFactories.registerCheck<VariadicFunctionDefCheck>("cert-dcl50-cpp"); CheckFactories.registerCheck<misc::NewDeleteOverloadsCheck>( "cert-dcl54-cpp"); CheckFactories.registerCheck<google::build::UnnamedNamespaceInHeaderCheck>( @@ -46,37 +45,27 @@ public: // ERR CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>( "cert-err09-cpp"); - CheckFactories.registerCheck<SetLongJmpCheck>( - "cert-err52-cpp"); - CheckFactories.registerCheck<StaticObjectExceptionCheck>( - "cert-err58-cpp"); - CheckFactories.registerCheck<ThrownExceptionTypeCheck>( - "cert-err60-cpp"); + CheckFactories.registerCheck<SetLongJmpCheck>("cert-err52-cpp"); + CheckFactories.registerCheck<StaticObjectExceptionCheck>("cert-err58-cpp"); + CheckFactories.registerCheck<ThrownExceptionTypeCheck>("cert-err60-cpp"); CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>( "cert-err61-cpp"); // MSC - CheckFactories.registerCheck<LimitedRandomnessCheck>( - "cert-msc50-cpp"); + CheckFactories.registerCheck<LimitedRandomnessCheck>("cert-msc50-cpp"); // C checkers // DCL - CheckFactories.registerCheck<misc::StaticAssertCheck>( - "cert-dcl03-c"); + CheckFactories.registerCheck<misc::StaticAssertCheck>("cert-dcl03-c"); // ENV - CheckFactories.registerCheck<CommandProcessorCheck>( - "cert-env33-c"); + CheckFactories.registerCheck<CommandProcessorCheck>("cert-env33-c"); // FLP - CheckFactories.registerCheck<FloatLoopCounter>( - "cert-flp30-c"); + CheckFactories.registerCheck<FloatLoopCounter>("cert-flp30-c"); // FIO - CheckFactories.registerCheck<misc::NonCopyableObjectsCheck>( - "cert-fio38-c"); + CheckFactories.registerCheck<misc::NonCopyableObjectsCheck>("cert-fio38-c"); // ERR - CheckFactories.registerCheck<StrToNumCheck>( - "cert-err34-c"); + CheckFactories.registerCheck<StrToNumCheck>("cert-err34-c"); // MSC - CheckFactories.registerCheck<LimitedRandomnessCheck>( - "cert-msc30-c"); + CheckFactories.registerCheck<LimitedRandomnessCheck>("cert-msc30-c"); } ClangTidyOptions getModuleOptions() override { ClangTidyOptions Options; @@ -89,8 +78,8 @@ public: // Register the MiscTidyModule using this statically initialized variable. static ClangTidyModuleRegistry::Add<cert::CERTModule> -X("cert-module", - "Adds lint checks corresponding to CERT secure coding guidelines."); + X("cert-module", + "Adds lint checks corresponding to CERT secure coding guidelines."); // This anchor is used to force the linker to link in the generated object file // and thus register the CERTModule. diff --git a/clang-tidy/cert/LimitedRandomnessCheck.cpp b/clang-tidy/cert/LimitedRandomnessCheck.cpp index 807f1835..f319f9fb 100644 --- a/clang-tidy/cert/LimitedRandomnessCheck.cpp +++ b/clang-tidy/cert/LimitedRandomnessCheck.cpp @@ -30,11 +30,9 @@ void LimitedRandomnessCheck::check(const MatchFinder::MatchResult &Result) { msg = "; use C++11 random library instead"; const auto *MatchedDecl = Result.Nodes.getNodeAs<CallExpr>("randomGenerator"); - diag(MatchedDecl->getLocStart(), - "rand() has limited randomness" + msg); + diag(MatchedDecl->getLocStart(), "rand() has limited randomness" + msg); } } // namespace cert } // namespace tidy } // namespace clang - diff --git a/clang-tidy/cert/StaticObjectExceptionCheck.cpp b/clang-tidy/cert/StaticObjectExceptionCheck.cpp index a5d85277..c465ecc5 100644 --- a/clang-tidy/cert/StaticObjectExceptionCheck.cpp +++ b/clang-tidy/cert/StaticObjectExceptionCheck.cpp @@ -47,7 +47,7 @@ void StaticObjectExceptionCheck::check(const MatchFinder::MatchResult &Result) { << VD << (VD->getStorageDuration() == SD_Static ? 0 : 1); SourceLocation FuncLocation = Func->getLocation(); - if(FuncLocation.isValid()) { + if (FuncLocation.isValid()) { diag(FuncLocation, "possibly throwing %select{constructor|function}0 declared here", DiagnosticIDs::Note) diff --git a/clang-tidy/cert/StrToNumCheck.cpp b/clang-tidy/cert/StrToNumCheck.cpp index d698a768..bd84cf2b 100644 --- a/clang-tidy/cert/StrToNumCheck.cpp +++ b/clang-tidy/cert/StrToNumCheck.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #include "StrToNumCheck.h" -#include "clang/Analysis/Analyses/FormatString.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Analysis/Analyses/FormatString.h" #include "llvm/ADT/StringSwitch.h" #include <cassert> diff --git a/clang-tidy/cert/ThrownExceptionTypeCheck.h b/clang-tidy/cert/ThrownExceptionTypeCheck.h index e05539ef..2f9d887f 100644 --- a/clang-tidy/cert/ThrownExceptionTypeCheck.h +++ b/clang-tidy/cert/ThrownExceptionTypeCheck.h @@ -23,7 +23,7 @@ namespace cert { class ThrownExceptionTypeCheck : public ClangTidyCheck { public: ThrownExceptionTypeCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context) {} + : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; }; diff --git a/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp b/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp index dc9a7f31..b34314c6 100644 --- a/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp +++ b/clang-tidy/cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp @@ -22,8 +22,8 @@ #include "ProTypeStaticCastDowncastCheck.h" #include "ProTypeUnionAccessCheck.h" #include "ProTypeVarargCheck.h" -#include "SpecialMemberFunctionsCheck.h" #include "SlicingCheck.h" +#include "SpecialMemberFunctionsCheck.h" namespace clang { namespace tidy { @@ -57,8 +57,7 @@ public: "cppcoreguidelines-pro-type-vararg"); CheckFactories.registerCheck<SpecialMemberFunctionsCheck>( "cppcoreguidelines-special-member-functions"); - CheckFactories.registerCheck<SlicingCheck>( - "cppcoreguidelines-slicing"); + CheckFactories.registerCheck<SlicingCheck>("cppcoreguidelines-slicing"); CheckFactories.registerCheck<misc::UnconventionalAssignOperatorCheck>( "cppcoreguidelines-c-copy-assignment-signature"); } diff --git a/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp b/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp index 56fbf742..3844f68e 100644 --- a/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp @@ -47,12 +47,12 @@ void ProBoundsConstantArrayIndexCheck::registerMatchers(MatchFinder *Finder) { // Note: if a struct contains an array member, the compiler-generated // constructor has an arraySubscriptExpr. - Finder->addMatcher(arraySubscriptExpr(hasBase(ignoringImpCasts(hasType( - constantArrayType().bind("type")))), - hasIndex(expr().bind("index")), - unless(hasAncestor(isImplicit()))) - .bind("expr"), - this); + Finder->addMatcher( + arraySubscriptExpr( + hasBase(ignoringImpCasts(hasType(constantArrayType().bind("type")))), + hasIndex(expr().bind("index")), unless(hasAncestor(isImplicit()))) + .bind("expr"), + this); Finder->addMatcher( cxxOperatorCallExpr( @@ -112,8 +112,7 @@ void ProBoundsConstantArrayIndexCheck::check( return; if (Index.isSigned() && Index.isNegative()) { - diag(Matched->getExprLoc(), - "std::array<> index %0 is negative") + diag(Matched->getExprLoc(), "std::array<> index %0 is negative") << Index.toString(10); return; } @@ -130,8 +129,9 @@ void ProBoundsConstantArrayIndexCheck::check( // Get uint64_t values, because different bitwidths would lead to an assertion // in APInt::uge. if (Index.getZExtValue() >= ArraySize.getZExtValue()) { - diag(Matched->getExprLoc(), "std::array<> index %0 is past the end of the array " - "(which contains %1 elements)") + diag(Matched->getExprLoc(), + "std::array<> index %0 is past the end of the array " + "(which contains %1 elements)") << Index.toString(10) << ArraySize.toString(10, false); } } diff --git a/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.cpp b/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.cpp index da850931..d664b640 100644 --- a/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.cpp @@ -47,8 +47,8 @@ void ProBoundsPointerArithmeticCheck::registerMatchers(MatchFinder *Finder) { this); } -void -ProBoundsPointerArithmeticCheck::check(const MatchFinder::MatchResult &Result) { +void ProBoundsPointerArithmeticCheck::check( + const MatchFinder::MatchResult &Result) { const auto *MatchedExpr = Result.Nodes.getNodeAs<Expr>("expr"); diag(MatchedExpr->getExprLoc(), "do not use pointer arithmetic"); diff --git a/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h b/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h index 6f330cf1..5ecf93cc 100644 --- a/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h +++ b/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h @@ -17,7 +17,8 @@ namespace tidy { namespace cppcoreguidelines { /// Flags all kinds of pointer arithmetic that have result of pointer type, i.e. -/// +, -, +=, -=, ++, --. In addition, the [] operator on pointers (not on arrays) is flagged. +/// +, -, +=, -=, ++, --. In addition, the [] operator on pointers (not on +/// arrays) is flagged. /// /// For the user-facing documentation see: /// http://clang.llvm.org/extra/clang-tidy/checks/cppcoreguidelines-pro-bounds-pointer-arithmetic.html diff --git a/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp b/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp index a5c26482..e64d36a6 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp @@ -278,8 +278,7 @@ void ProTypeMemberInitCheck::registerMatchers(MatchFinder *Finder) { // AST. Finder->addMatcher( cxxRecordDecl( - isDefinition(), unless(isInstantiated()), - hasDefaultConstructor(), + isDefinition(), unless(isInstantiated()), hasDefaultConstructor(), anyOf(has(cxxConstructorDecl(isDefaultConstructor(), isDefaulted(), unless(isImplicit()))), unless(has(cxxConstructorDecl()))), @@ -465,7 +464,7 @@ void ProTypeMemberInitCheck::checkMissingBaseClassInitializer( << toCommaSeparatedString(AllBases, BasesToInit); if (Ctor) - fixInitializerList(Context, Diag, Ctor, BasesToInit); + fixInitializerList(Context, Diag, Ctor, BasesToInit); } void ProTypeMemberInitCheck::checkUninitializedTrivialType( diff --git a/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp b/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp index 153e1cae..f43e4fa1 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp @@ -26,7 +26,8 @@ void ProTypeStaticCastDowncastCheck::registerMatchers(MatchFinder *Finder) { this); } -void ProTypeStaticCastDowncastCheck::check(const MatchFinder::MatchResult &Result) { +void ProTypeStaticCastDowncastCheck::check( + const MatchFinder::MatchResult &Result) { const auto *MatchedCast = Result.Nodes.getNodeAs<CXXStaticCastExpr>("cast"); if (MatchedCast->getCastKind() != CK_BaseToDerived) return; diff --git a/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.h b/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.h index 77224237..b6d76a69 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.h +++ b/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.h @@ -16,7 +16,8 @@ namespace clang { namespace tidy { namespace cppcoreguidelines { -/// Checks for usages of static_cast, where a base class is downcasted to a derived class. +/// Checks for usages of static_cast, where a base class is downcasted to a +/// derived class. /// /// For the user-facing documentation see: /// http://clang.llvm.org/extra/clang-tidy/checks/cppcoreguidelines-pro-type-static-cast-downcast.html diff --git a/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp b/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp index 5233ad8f..09752f69 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.cpp @@ -21,15 +21,18 @@ void ProTypeUnionAccessCheck::registerMatchers(MatchFinder *Finder) { if (!getLangOpts().CPlusPlus) return; - Finder->addMatcher(memberExpr(hasObjectExpression(hasType(recordDecl(isUnion())))).bind("expr"), this); + Finder->addMatcher( + memberExpr(hasObjectExpression(hasType(recordDecl(isUnion())))) + .bind("expr"), + this); } void ProTypeUnionAccessCheck::check(const MatchFinder::MatchResult &Result) { const auto *Matched = Result.Nodes.getNodeAs<MemberExpr>("expr"); - diag(Matched->getMemberLoc(), "do not access members of unions; use (boost::)variant instead"); + diag(Matched->getMemberLoc(), + "do not access members of unions; use (boost::)variant instead"); } } // namespace cppcoreguidelines } // namespace tidy } // namespace clang - diff --git a/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.h b/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.h index 28097faa..fc7dd671 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.h +++ b/clang-tidy/cppcoreguidelines/ProTypeUnionAccessCheck.h @@ -34,4 +34,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CPPCOREGUIDELINES_PRO_TYPE_UNION_ACCESS_H - diff --git a/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp b/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp index 680037f9..56227b23 100644 --- a/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp +++ b/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp @@ -26,9 +26,7 @@ void ProTypeVarargCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher(vAArgExpr().bind("va_use"), this); Finder->addMatcher( - callExpr(callee(functionDecl(isVariadic()))) - .bind("callvararg"), - this); + callExpr(callee(functionDecl(isVariadic()))).bind("callvararg"), this); } static bool hasSingleVariadicArgumentWithValue(const CallExpr *C, uint64_t I) { diff --git a/clang-tidy/google/AvoidCStyleCastsCheck.cpp b/clang-tidy/google/AvoidCStyleCastsCheck.cpp index d118db58..10dcb342 100644 --- a/clang-tidy/google/AvoidCStyleCastsCheck.cpp +++ b/clang-tidy/google/AvoidCStyleCastsCheck.cpp @@ -20,8 +20,8 @@ namespace tidy { namespace google { namespace readability { -void -AvoidCStyleCastsCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { +void AvoidCStyleCastsCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { Finder->addMatcher( cStyleCastExpr( // Filter out (EnumType)IntegerLiteral construct, which is generated @@ -29,7 +29,8 @@ AvoidCStyleCastsCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { // FIXME: Remove this once this is fixed in the AST. unless(hasParent(substNonTypeTemplateParmExpr())), // Avoid matches in template instantiations. - unless(isInTemplateInstantiation())).bind("cast"), + unless(isInTemplateInstantiation())) + .bind("cast"), this); } @@ -143,7 +144,7 @@ void AvoidCStyleCastsCheck::check(const MatchFinder::MatchResult &Result) { ReplaceWithCast("const_cast"); return; } - // FALLTHROUGH + // FALLTHROUGH case clang::CK_IntegralCast: // Convert integral and no-op casts between builtin types and enums to // static_cast. A cast from enum to integer may be unnecessary, but it's diff --git a/clang-tidy/google/ExplicitMakePairCheck.cpp b/clang-tidy/google/ExplicitMakePairCheck.cpp index a07e0fff..6c2f0a36 100644 --- a/clang-tidy/google/ExplicitMakePairCheck.cpp +++ b/clang-tidy/google/ExplicitMakePairCheck.cpp @@ -25,8 +25,8 @@ namespace tidy { namespace google { namespace build { -void -ExplicitMakePairCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { +void ExplicitMakePairCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { // Only register the matchers for C++; the functionality currently does not // provide any benefit to other languages, despite being benign. if (!getLangOpts().CPlusPlus) @@ -39,7 +39,8 @@ ExplicitMakePairCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { callee(expr(ignoringParenImpCasts( declRefExpr(hasExplicitTemplateArgs(), to(functionDecl(hasName("::std::make_pair")))) - .bind("declref"))))).bind("call"), + .bind("declref"))))) + .bind("call"), this); } @@ -61,13 +62,13 @@ void ExplicitMakePairCheck::check(const MatchFinder::MatchResult &Result) { Arg1->getType() != Call->getArg(1)->getType()) { diag(Call->getLocStart(), "for C++11-compatibility, use pair directly") << FixItHint::CreateReplacement( - SourceRange(DeclRef->getLocStart(), DeclRef->getLAngleLoc()), - "std::pair<"); + SourceRange(DeclRef->getLocStart(), DeclRef->getLAngleLoc()), + "std::pair<"); } else { diag(Call->getLocStart(), "for C++11-compatibility, omit template arguments from make_pair") << FixItHint::CreateRemoval( - SourceRange(DeclRef->getLAngleLoc(), DeclRef->getRAngleLoc())); + SourceRange(DeclRef->getLAngleLoc(), DeclRef->getRAngleLoc())); } } diff --git a/clang-tidy/google/GlobalNamesInHeadersCheck.cpp b/clang-tidy/google/GlobalNamesInHeadersCheck.cpp index 4e70754d..71049d99 100644 --- a/clang-tidy/google/GlobalNamesInHeadersCheck.cpp +++ b/clang-tidy/google/GlobalNamesInHeadersCheck.cpp @@ -26,8 +26,7 @@ GlobalNamesInHeadersCheck::GlobalNamesInHeadersCheck(StringRef Name, RawStringHeaderFileExtensions( Options.getLocalOrGlobal("HeaderFileExtensions", "h")) { if (!utils::parseHeaderFileExtensions(RawStringHeaderFileExtensions, - HeaderFileExtensions, - ',')) { + HeaderFileExtensions, ',')) { llvm::errs() << "Invalid header file extension: " << RawStringHeaderFileExtensions << "\n"; } @@ -38,12 +37,12 @@ void GlobalNamesInHeadersCheck::storeOptions( Options.store(Opts, "HeaderFileExtensions", RawStringHeaderFileExtensions); } -void -GlobalNamesInHeadersCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { - Finder->addMatcher( - decl(anyOf(usingDecl(), usingDirectiveDecl()), - hasDeclContext(translationUnitDecl())).bind("using_decl"), - this); +void GlobalNamesInHeadersCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { + Finder->addMatcher(decl(anyOf(usingDecl(), usingDirectiveDecl()), + hasDeclContext(translationUnitDecl())) + .bind("using_decl"), + this); } void GlobalNamesInHeadersCheck::check(const MatchFinder::MatchResult &Result) { @@ -61,7 +60,7 @@ void GlobalNamesInHeadersCheck::check(const MatchFinder::MatchResult &Result) { return; } - if (const auto* UsingDirective = dyn_cast<UsingDirectiveDecl>(D)) { + if (const auto *UsingDirective = dyn_cast<UsingDirectiveDecl>(D)) { if (UsingDirective->getNominatedNamespace()->isAnonymousNamespace()) { // Anynoumous namespaces inject a using directive into the AST to import // the names into the containing namespace. diff --git a/clang-tidy/google/GoogleTidyModule.cpp b/clang-tidy/google/GoogleTidyModule.cpp index 49f879cc..e9b4bedf 100644 --- a/clang-tidy/google/GoogleTidyModule.cpp +++ b/clang-tidy/google/GoogleTidyModule.cpp @@ -21,8 +21,8 @@ #include "GlobalNamesInHeadersCheck.h" #include "IntegerTypesCheck.h" #include "MemsetZeroLengthCheck.h" -#include "OverloadedUnaryAndCheck.h" #include "NonConstReferences.h" +#include "OverloadedUnaryAndCheck.h" #include "StringReferenceMemberCheck.h" #include "TodoCommentCheck.h" #include "UnnamedNamespaceInHeaderCheck.h" diff --git a/clang-tidy/google/IntegerTypesCheck.cpp b/clang-tidy/google/IntegerTypesCheck.cpp index 00458129..f6c917ca 100644 --- a/clang-tidy/google/IntegerTypesCheck.cpp +++ b/clang-tidy/google/IntegerTypesCheck.cpp @@ -40,7 +40,6 @@ namespace tidy { namespace google { namespace runtime { - IntegerTypesCheck::IntegerTypesCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context), UnsignedTypePrefix(Options.get("UnsignedTypePrefix", "uint")), diff --git a/clang-tidy/google/MemsetZeroLengthCheck.cpp b/clang-tidy/google/MemsetZeroLengthCheck.cpp index bcf4b5b3..fa87fab2 100644 --- a/clang-tidy/google/MemsetZeroLengthCheck.cpp +++ b/clang-tidy/google/MemsetZeroLengthCheck.cpp @@ -20,15 +20,16 @@ namespace tidy { namespace google { namespace runtime { -void -MemsetZeroLengthCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { +void MemsetZeroLengthCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { // Look for memset(x, y, 0) as those is most likely an argument swap. // TODO: Also handle other standard functions that suffer from the same // problem, e.g. memchr. - Finder->addMatcher( - callExpr(callee(functionDecl(hasName("::memset"))), argumentCountIs(3), - unless(isInTemplateInstantiation())).bind("decl"), - this); + Finder->addMatcher(callExpr(callee(functionDecl(hasName("::memset"))), + argumentCountIs(3), + unless(isInTemplateInstantiation())) + .bind("decl"), + this); } /// \brief Get a StringRef representing a SourceRange. diff --git a/clang-tidy/google/NonConstReferences.cpp b/clang-tidy/google/NonConstReferences.cpp index d1bc1534..5cfdc10c 100644 --- a/clang-tidy/google/NonConstReferences.cpp +++ b/clang-tidy/google/NonConstReferences.cpp @@ -27,8 +27,8 @@ NonConstReferences::NonConstReferences(StringRef Name, utils::options::parseStringList(Options.get("WhiteListTypes", ""))) {} void NonConstReferences::storeOptions(ClangTidyOptions::OptionMap &Opts) { - Options.store(Opts, "WhiteListTypes", - utils::options::serializeStringList(WhiteListTypes)); + Options.store(Opts, "WhiteListTypes", + utils::options::serializeStringList(WhiteListTypes)); } void NonConstReferences::registerMatchers(MatchFinder *Finder) { @@ -133,9 +133,8 @@ void NonConstReferences::check(const MatchFinder::MatchResult &Result) { return; if (Parameter->getName().empty()) { - diag(Parameter->getLocation(), - "non-const reference parameter at index %0, " - "make it const or use a pointer") + diag(Parameter->getLocation(), "non-const reference parameter at index %0, " + "make it const or use a pointer") << Parameter->getFunctionScopeIndex(); } else { diag(Parameter->getLocation(), diff --git a/clang-tidy/google/OverloadedUnaryAndCheck.cpp b/clang-tidy/google/OverloadedUnaryAndCheck.cpp index 6fb1ca9d..84abb5fd 100644 --- a/clang-tidy/google/OverloadedUnaryAndCheck.cpp +++ b/clang-tidy/google/OverloadedUnaryAndCheck.cpp @@ -19,8 +19,8 @@ namespace tidy { namespace google { namespace runtime { -void -OverloadedUnaryAndCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { +void OverloadedUnaryAndCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { // Only register the matchers for C++; the functionality currently does not // provide any benefit to other languages, despite being benign. if (!getLangOpts().CPlusPlus) @@ -34,10 +34,10 @@ OverloadedUnaryAndCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { // Also match freestanding unary operator& overloads. Be careful not to match // binary methods. Finder->addMatcher( - functionDecl( - allOf(unless(cxxMethodDecl()), - functionDecl(parameterCountIs(1), - hasOverloadedOperatorName("&")).bind("overload"))), + functionDecl(allOf( + unless(cxxMethodDecl()), + functionDecl(parameterCountIs(1), hasOverloadedOperatorName("&")) + .bind("overload"))), this); } diff --git a/clang-tidy/google/StringReferenceMemberCheck.cpp b/clang-tidy/google/StringReferenceMemberCheck.cpp index c6324573..36d979b6 100644 --- a/clang-tidy/google/StringReferenceMemberCheck.cpp +++ b/clang-tidy/google/StringReferenceMemberCheck.cpp @@ -32,13 +32,13 @@ void StringReferenceMemberCheck::registerMatchers( auto ConstString = qualType(isConstQualified(), hasDeclaration(String)); // Ignore members in template instantiations. - Finder->addMatcher(fieldDecl(hasType(references(ConstString)), - unless(isInstantiated())).bind("member"), - this); + Finder->addMatcher( + fieldDecl(hasType(references(ConstString)), unless(isInstantiated())) + .bind("member"), + this); } -void -StringReferenceMemberCheck::check(const MatchFinder::MatchResult &Result) { +void StringReferenceMemberCheck::check(const MatchFinder::MatchResult &Result) { const auto *Member = Result.Nodes.getNodeAs<FieldDecl>("member"); diag(Member->getLocStart(), "const string& members are dangerous; it is much " "better to use alternatives, such as pointers or " diff --git a/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp b/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp index cf539ca6..3e76bdb8 100644 --- a/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp +++ b/clang-tidy/google/UnnamedNamespaceInHeaderCheck.cpp @@ -25,8 +25,7 @@ UnnamedNamespaceInHeaderCheck::UnnamedNamespaceInHeaderCheck( RawStringHeaderFileExtensions( Options.getLocalOrGlobal("HeaderFileExtensions", "h,hh,hpp,hxx")) { if (!utils::parseHeaderFileExtensions(RawStringHeaderFileExtensions, - HeaderFileExtensions, - ',')) { + HeaderFileExtensions, ',')) { llvm::errs() << "Invalid header file extension: " << RawStringHeaderFileExtensions << "\n"; } @@ -46,8 +45,8 @@ void UnnamedNamespaceInHeaderCheck::registerMatchers( this); } -void -UnnamedNamespaceInHeaderCheck::check(const MatchFinder::MatchResult &Result) { +void UnnamedNamespaceInHeaderCheck::check( + const MatchFinder::MatchResult &Result) { const auto *N = Result.Nodes.getNodeAs<NamespaceDecl>("anonymousNamespace"); SourceLocation Loc = N->getLocStart(); if (!Loc.isValid()) diff --git a/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp b/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp index c4ac5a4b..6fc6fd3f 100644 --- a/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp +++ b/clang-tidy/google/UsingNamespaceDirectiveCheck.cpp @@ -27,8 +27,8 @@ void UsingNamespaceDirectiveCheck::registerMatchers( Finder->addMatcher(usingDirectiveDecl().bind("usingNamespace"), this); } -void -UsingNamespaceDirectiveCheck::check(const MatchFinder::MatchResult &Result) { +void UsingNamespaceDirectiveCheck::check( + const MatchFinder::MatchResult &Result) { const auto *U = Result.Nodes.getNodeAs<UsingDirectiveDecl>("usingNamespace"); SourceLocation Loc = U->getLocStart(); if (U->isImplicit() || !Loc.isValid()) diff --git a/clang-tidy/llvm/HeaderGuardCheck.cpp b/clang-tidy/llvm/HeaderGuardCheck.cpp index 2ff9fd8c..6e0c2cb1 100644 --- a/clang-tidy/llvm/HeaderGuardCheck.cpp +++ b/clang-tidy/llvm/HeaderGuardCheck.cpp @@ -14,7 +14,7 @@ namespace tidy { namespace llvm { LLVMHeaderGuardCheck::LLVMHeaderGuardCheck(StringRef Name, - ClangTidyContext* Context) + ClangTidyContext *Context) : HeaderGuardCheck(Name, Context), RawStringHeaderFileExtensions( Options.getLocalOrGlobal("HeaderFileExtensions", ",h,hh,hpp,hxx")) { diff --git a/clang-tidy/misc/ArgumentCommentCheck.cpp b/clang-tidy/misc/ArgumentCommentCheck.cpp index 7bf60215..20069b94 100644 --- a/clang-tidy/misc/ArgumentCommentCheck.cpp +++ b/clang-tidy/misc/ArgumentCommentCheck.cpp @@ -164,8 +164,8 @@ void ArgumentCommentCheck::checkCallArgs(ASTContext *Ctx, << Matches[2] << II; if (isLikelyTypo(Callee->parameters(), Matches[2], I)) { Diag << FixItHint::CreateReplacement( - Comment.first, - (Matches[1] + II->getName() + Matches[3]).str()); + Comment.first, + (Matches[1] + II->getName() + Matches[3]).str()); } } diag(PVD->getLocation(), "%0 declared here", DiagnosticIDs::Note) diff --git a/clang-tidy/misc/ArgumentCommentCheck.h b/clang-tidy/misc/ArgumentCommentCheck.h index c64ef6e8..929675b5 100644 --- a/clang-tidy/misc/ArgumentCommentCheck.h +++ b/clang-tidy/misc/ArgumentCommentCheck.h @@ -37,7 +37,7 @@ public: void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; - void storeOptions(ClangTidyOptions::OptionMap& Opts) override; + void storeOptions(ClangTidyOptions::OptionMap &Opts) override; private: const bool StrictMode; diff --git a/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp b/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp index f293be45..4dc459ab 100644 --- a/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp +++ b/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp @@ -25,7 +25,8 @@ void BoolPointerImplicitConversionCheck::registerMatchers(MatchFinder *Finder) { hasType(pointerType(pointee(booleanType()))), ignoringParenImpCasts(declRefExpr().bind("expr")))), hasCastKind(CK_PointerToBoolean))))), - unless(isInTemplateInstantiation())).bind("if"), + unless(isInTemplateInstantiation())) + .bind("if"), this); } diff --git a/clang-tidy/misc/BoolPointerImplicitConversionCheck.h b/clang-tidy/misc/BoolPointerImplicitConversionCheck.h index 80dcdc78..d8a90f35 100644 --- a/clang-tidy/misc/BoolPointerImplicitConversionCheck.h +++ b/clang-tidy/misc/BoolPointerImplicitConversionCheck.h @@ -40,4 +40,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOLPOINTERIMPLICITCONVERSIONCHECK_H - diff --git a/clang-tidy/misc/DefinitionsInHeadersCheck.cpp b/clang-tidy/misc/DefinitionsInHeadersCheck.cpp index 77ca26fd..f74e04e5 100644 --- a/clang-tidy/misc/DefinitionsInHeadersCheck.cpp +++ b/clang-tidy/misc/DefinitionsInHeadersCheck.cpp @@ -35,8 +35,7 @@ DefinitionsInHeadersCheck::DefinitionsInHeadersCheck(StringRef Name, RawStringHeaderFileExtensions( Options.getLocalOrGlobal("HeaderFileExtensions", ",h,hh,hpp,hxx")) { if (!utils::parseHeaderFileExtensions(RawStringHeaderFileExtensions, - HeaderFileExtensions, - ',')) { + HeaderFileExtensions, ',')) { // FIXME: Find a more suitable way to handle invalid configuration // options. llvm::errs() << "Invalid header file extension: " diff --git a/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp b/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp index 98053ff0..1487e8f1 100644 --- a/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp +++ b/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp @@ -8,12 +8,12 @@ //===----------------------------------------------------------------------===// #include "ForwardDeclarationNamespaceCheck.h" -#include <stack> -#include <string> #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/ASTMatchers/ASTMatchers.h" +#include <stack> +#include <string> using namespace clang::ast_matchers; diff --git a/clang-tidy/misc/ForwardDeclarationNamespaceCheck.h b/clang-tidy/misc/ForwardDeclarationNamespaceCheck.h index cc701daa..dd7042d3 100644 --- a/clang-tidy/misc/ForwardDeclarationNamespaceCheck.h +++ b/clang-tidy/misc/ForwardDeclarationNamespaceCheck.h @@ -10,10 +10,10 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_FORWARDDECLARATIONNAMESPACECHECK_H #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_FORWARDDECLARATIONNAMESPACECHECK_H +#include "../ClangTidy.h" +#include "llvm/ADT/SmallPtrSet.h" #include <set> #include <vector> -#include "llvm/ADT/SmallPtrSet.h" -#include "../ClangTidy.h" namespace clang { namespace tidy { diff --git a/clang-tidy/misc/IncorrectRoundings.cpp b/clang-tidy/misc/IncorrectRoundings.cpp index ee6f666f..88365eff 100644 --- a/clang-tidy/misc/IncorrectRoundings.cpp +++ b/clang-tidy/misc/IncorrectRoundings.cpp @@ -31,7 +31,6 @@ AST_MATCHER(FloatingLiteral, floatHalf) { } } // namespace - void IncorrectRoundings::registerMatchers(MatchFinder *MatchFinder) { // Match a floating literal with value 0.5. auto FloatHalf = floatLiteral(floatHalf()); diff --git a/clang-tidy/misc/IncorrectRoundings.h b/clang-tidy/misc/IncorrectRoundings.h index 7c571bdf..7b5f6a0a 100644 --- a/clang-tidy/misc/IncorrectRoundings.h +++ b/clang-tidy/misc/IncorrectRoundings.h @@ -36,4 +36,4 @@ public: } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_INCORRECTROUNDINGS_H_ +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_INCORRECTROUNDINGS_H_ diff --git a/clang-tidy/misc/MacroParenthesesCheck.cpp b/clang-tidy/misc/MacroParenthesesCheck.cpp index cfc94c47..dd4df1cc 100644 --- a/clang-tidy/misc/MacroParenthesesCheck.cpp +++ b/clang-tidy/misc/MacroParenthesesCheck.cpp @@ -79,7 +79,8 @@ static bool possibleVarDecl(const MacroInfo *MI, const Token *Tok) { if (Tok == MI->tokens_end()) return false; - // If we see int/short/struct/etc., just assume this is a variable declaration. + // If we see int/short/struct/etc., just assume this is a variable + // declaration. if (isVarDeclKeyword(*Tok)) return true; @@ -88,10 +89,10 @@ static bool possibleVarDecl(const MacroInfo *MI, const Token *Tok) { return false; // Skip possible types, etc - while ( - Tok != MI->tokens_end() && - Tok->isOneOf(tok::identifier, tok::raw_identifier, tok::coloncolon, - tok::star, tok::amp, tok::ampamp, tok::less, tok::greater)) + while (Tok != MI->tokens_end() && + Tok->isOneOf(tok::identifier, tok::raw_identifier, tok::coloncolon, + tok::star, tok::amp, tok::ampamp, tok::less, + tok::greater)) Tok++; // Return true for possible variable declarations. diff --git a/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp b/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp index 699966a8..229ec850 100644 --- a/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp +++ b/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp @@ -9,9 +9,9 @@ #include "MacroRepeatedSideEffectsCheck.h" #include "clang/Frontend/CompilerInstance.h" +#include "clang/Lex/MacroArgs.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/Preprocessor.h" -#include "clang/Lex/MacroArgs.h" namespace clang { namespace tidy { diff --git a/clang-tidy/misc/MiscTidyModule.cpp b/clang-tidy/misc/MiscTidyModule.cpp index a51f13a5..eeef362a 100644 --- a/clang-tidy/misc/MiscTidyModule.cpp +++ b/clang-tidy/misc/MiscTidyModule.cpp @@ -12,8 +12,6 @@ #include "../ClangTidyModuleRegistry.h" #include "ArgumentCommentCheck.h" #include "AssertSideEffectCheck.h" -#include "MisplacedConstCheck.h" -#include "UnconventionalAssignOperatorCheck.h" #include "BoolPointerImplicitConversionCheck.h" #include "DanglingHandleCheck.h" #include "DefinitionsInHeadersCheck.h" @@ -24,6 +22,7 @@ #include "InefficientAlgorithmCheck.h" #include "MacroParenthesesCheck.h" #include "MacroRepeatedSideEffectsCheck.h" +#include "MisplacedConstCheck.h" #include "MisplacedWideningCastCheck.h" #include "MoveConstantArgumentCheck.h" #include "MoveConstructorInitCheck.h" @@ -44,6 +43,7 @@ #include "SuspiciousStringCompareCheck.h" #include "SwappedArgumentsCheck.h" #include "ThrowByValueCatchByReferenceCheck.h" +#include "UnconventionalAssignOperatorCheck.h" #include "UndelegatedConstructor.h" #include "UniqueptrResetReleaseCheck.h" #include "UnusedAliasDeclsCheck.h" @@ -63,22 +63,18 @@ public: CheckFactories.registerCheck<ArgumentCommentCheck>("misc-argument-comment"); CheckFactories.registerCheck<AssertSideEffectCheck>( "misc-assert-side-effect"); - CheckFactories.registerCheck<MisplacedConstCheck>( - "misc-misplaced-const"); + CheckFactories.registerCheck<MisplacedConstCheck>("misc-misplaced-const"); CheckFactories.registerCheck<UnconventionalAssignOperatorCheck>( "misc-unconventional-assign-operator"); CheckFactories.registerCheck<BoolPointerImplicitConversionCheck>( "misc-bool-pointer-implicit-conversion"); - CheckFactories.registerCheck<DanglingHandleCheck>( - "misc-dangling-handle"); + CheckFactories.registerCheck<DanglingHandleCheck>("misc-dangling-handle"); CheckFactories.registerCheck<DefinitionsInHeadersCheck>( "misc-definitions-in-headers"); - CheckFactories.registerCheck<FoldInitTypeCheck>( - "misc-fold-init-type"); + CheckFactories.registerCheck<FoldInitTypeCheck>("misc-fold-init-type"); CheckFactories.registerCheck<ForwardDeclarationNamespaceCheck>( "misc-forward-declaration-namespace"); - CheckFactories.registerCheck<InaccurateEraseCheck>( - "misc-inaccurate-erase"); + CheckFactories.registerCheck<InaccurateEraseCheck>("misc-inaccurate-erase"); CheckFactories.registerCheck<IncorrectRoundings>( "misc-incorrect-roundings"); CheckFactories.registerCheck<InefficientAlgorithmCheck>( @@ -108,8 +104,7 @@ public: CheckFactories.registerCheck<SizeofContainerCheck>("misc-sizeof-container"); CheckFactories.registerCheck<SizeofExpressionCheck>( "misc-sizeof-expression"); - CheckFactories.registerCheck<StaticAssertCheck>( - "misc-static-assert"); + CheckFactories.registerCheck<StaticAssertCheck>("misc-static-assert"); CheckFactories.registerCheck<StringConstructorCheck>( "misc-string-constructor"); CheckFactories.registerCheck<StringIntegerAssignmentCheck>( @@ -147,7 +142,7 @@ public: // Register the MiscTidyModule using this statically initialized variable. static ClangTidyModuleRegistry::Add<misc::MiscModule> -X("misc-module", "Adds miscellaneous lint checks."); + X("misc-module", "Adds miscellaneous lint checks."); // This anchor is used to force the linker to link in the generated object file // and thus register the MiscModule. diff --git a/clang-tidy/misc/MisplacedWideningCastCheck.cpp b/clang-tidy/misc/MisplacedWideningCastCheck.cpp index 7919258e..c49f96a0 100644 --- a/clang-tidy/misc/MisplacedWideningCastCheck.cpp +++ b/clang-tidy/misc/MisplacedWideningCastCheck.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #include "MisplacedWideningCastCheck.h" +#include "../utils/Matchers.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" -#include "../utils/Matchers.h" using namespace clang::ast_matchers; @@ -49,8 +49,7 @@ void MisplacedWideningCastCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher(callExpr(hasAnyArgument(Cast)), this); Finder->addMatcher(binaryOperator(hasOperatorName("="), hasRHS(Cast)), this); Finder->addMatcher( - binaryOperator(matchers::isComparisonOperator(), - hasEitherOperand(Cast)), + binaryOperator(matchers::isComparisonOperator(), hasEitherOperand(Cast)), this); } diff --git a/clang-tidy/misc/MoveConstantArgumentCheck.cpp b/clang-tidy/misc/MoveConstantArgumentCheck.cpp index 04812139..058ad2b8 100644 --- a/clang-tidy/misc/MoveConstantArgumentCheck.cpp +++ b/clang-tidy/misc/MoveConstantArgumentCheck.cpp @@ -83,8 +83,8 @@ void MoveConstantArgumentCheck::check(const MatchFinder::MatchResult &Result) { "has no effect; remove std::move()" "%select{| or make the variable non-const}3") << IsConstArg << IsVariable << IsTriviallyCopyable - << (IsConstArg && IsVariable && !IsTriviallyCopyable) - << Var << Arg->getType(); + << (IsConstArg && IsVariable && !IsTriviallyCopyable) << Var + << Arg->getType(); ReplaceCallWithArg(CallMove, Diag, SM, getLangOpts()); } else if (ReceivingExpr) { diff --git a/clang-tidy/misc/MoveConstructorInitCheck.cpp b/clang-tidy/misc/MoveConstructorInitCheck.cpp index c696c4c6..b27918cd 100644 --- a/clang-tidy/misc/MoveConstructorInitCheck.cpp +++ b/clang-tidy/misc/MoveConstructorInitCheck.cpp @@ -126,7 +126,8 @@ void MoveConstructorInitCheck::handleParamNotMoved( void MoveConstructorInitCheck::handleMoveConstructor( const MatchFinder::MatchResult &Result) { const auto *CopyCtor = Result.Nodes.getNodeAs<CXXConstructorDecl>("ctor"); - const auto *Initializer = Result.Nodes.getNodeAs<CXXCtorInitializer>("move-init"); + const auto *Initializer = + Result.Nodes.getNodeAs<CXXCtorInitializer>("move-init"); // Do not diagnose if the expression used to perform the initialization is a // trivially-copyable type. diff --git a/clang-tidy/misc/MultipleStatementMacroCheck.cpp b/clang-tidy/misc/MultipleStatementMacroCheck.cpp index b7001aee..a8a220bf 100644 --- a/clang-tidy/misc/MultipleStatementMacroCheck.cpp +++ b/clang-tidy/misc/MultipleStatementMacroCheck.cpp @@ -29,7 +29,7 @@ const Stmt *nextStmt(const MatchFinder::MatchResult &Result, const Stmt *S) { const Stmt *Parent = Parents[0].get<Stmt>(); if (!Parent) return nullptr; - const Stmt* Prev = nullptr; + const Stmt *Prev = nullptr; for (const Stmt *Child : Parent->children()) { if (Prev == S) return Child; @@ -53,7 +53,7 @@ ExpansionRanges getExpansionRanges(SourceLocation Loc, return Locs; } -} // namespace +} // namespace void MultipleStatementMacroCheck::registerMatchers(MatchFinder *Finder) { const auto Inner = expr(isInMacro(), unless(compoundStmt())).bind("inner"); diff --git a/clang-tidy/misc/NewDeleteOverloadsCheck.cpp b/clang-tidy/misc/NewDeleteOverloadsCheck.cpp index 4da50065..5e291195 100644 --- a/clang-tidy/misc/NewDeleteOverloadsCheck.cpp +++ b/clang-tidy/misc/NewDeleteOverloadsCheck.cpp @@ -64,7 +64,8 @@ AST_MATCHER(FunctionDecl, isPlacementOverload) { OverloadedOperatorKind getCorrespondingOverload(const FunctionDecl *FD) { switch (FD->getOverloadedOperator()) { - default: break; + default: + break; case OO_New: return OO_Delete; case OO_Delete: @@ -79,7 +80,8 @@ OverloadedOperatorKind getCorrespondingOverload(const FunctionDecl *FD) { const char *getOperatorName(OverloadedOperatorKind K) { switch (K) { - default: break; + default: + break; case OO_New: return "operator new"; case OO_Delete: @@ -140,13 +142,12 @@ void NewDeleteOverloadsCheck::registerMatchers(MatchFinder *Finder) { // However, I think it's more reasonable to warn in this case as the user // should really be writing that as a deleted function. Finder->addMatcher( - functionDecl( - unless(anyOf(isImplicit(), isPlacementOverload(), isDeleted(), - cxxMethodDecl(isPrivate()))), - anyOf(hasOverloadedOperatorName("new"), - hasOverloadedOperatorName("new[]"), - hasOverloadedOperatorName("delete"), - hasOverloadedOperatorName("delete[]"))) + functionDecl(unless(anyOf(isImplicit(), isPlacementOverload(), + isDeleted(), cxxMethodDecl(isPrivate()))), + anyOf(hasOverloadedOperatorName("new"), + hasOverloadedOperatorName("new[]"), + hasOverloadedOperatorName("delete"), + hasOverloadedOperatorName("delete[]"))) .bind("func"), this); } diff --git a/clang-tidy/misc/NewDeleteOverloadsCheck.h b/clang-tidy/misc/NewDeleteOverloadsCheck.h index 582e659d..3e99892b 100644 --- a/clang-tidy/misc/NewDeleteOverloadsCheck.h +++ b/clang-tidy/misc/NewDeleteOverloadsCheck.h @@ -20,11 +20,12 @@ namespace misc { class NewDeleteOverloadsCheck : public ClangTidyCheck { std::map<const clang::CXXRecordDecl *, - llvm::SmallVector<const clang::FunctionDecl *, 4>> Overloads; + llvm::SmallVector<const clang::FunctionDecl *, 4>> + Overloads; public: NewDeleteOverloadsCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context) {} + : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; void onEndOfTranslationUnit() override; diff --git a/clang-tidy/misc/NoexceptMoveConstructorCheck.cpp b/clang-tidy/misc/NoexceptMoveConstructorCheck.cpp index 769efe4e..f145db82 100644 --- a/clang-tidy/misc/NoexceptMoveConstructorCheck.cpp +++ b/clang-tidy/misc/NoexceptMoveConstructorCheck.cpp @@ -43,8 +43,8 @@ void NoexceptMoveConstructorCheck::check( } const auto *ProtoType = Decl->getType()->getAs<FunctionProtoType>(); - switch(ProtoType->getNoexceptSpec(*Result.Context)) { - case FunctionProtoType::NR_NoNoexcept: + switch (ProtoType->getNoexceptSpec(*Result.Context)) { + case FunctionProtoType::NR_NoNoexcept: diag(Decl->getLocation(), "move %0s should be marked noexcept") << MethodType; // FIXME: Add a fixit. @@ -71,4 +71,3 @@ void NoexceptMoveConstructorCheck::check( } // namespace misc } // namespace tidy } // namespace clang - diff --git a/clang-tidy/misc/NoexceptMoveConstructorCheck.h b/clang-tidy/misc/NoexceptMoveConstructorCheck.h index 0c976af1..e6a0ef92 100644 --- a/clang-tidy/misc/NoexceptMoveConstructorCheck.h +++ b/clang-tidy/misc/NoexceptMoveConstructorCheck.h @@ -36,4 +36,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_NOEXCEPTMOVECONSTRUCTORCHECK_H - diff --git a/clang-tidy/misc/NonCopyableObjects.h b/clang-tidy/misc/NonCopyableObjects.h index 9805f74f..38a45fd5 100644 --- a/clang-tidy/misc/NonCopyableObjects.h +++ b/clang-tidy/misc/NonCopyableObjects.h @@ -21,7 +21,7 @@ namespace misc { class NonCopyableObjectsCheck : public ClangTidyCheck { public: NonCopyableObjectsCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context) {} + : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; }; diff --git a/clang-tidy/misc/SizeofContainerCheck.cpp b/clang-tidy/misc/SizeofContainerCheck.cpp index 7555d3b7..de4e8ad1 100644 --- a/clang-tidy/misc/SizeofContainerCheck.cpp +++ b/clang-tidy/misc/SizeofContainerCheck.cpp @@ -47,4 +47,3 @@ void SizeofContainerCheck::check(const MatchFinder::MatchResult &Result) { } // namespace misc } // namespace tidy } // namespace clang - diff --git a/clang-tidy/misc/SizeofContainerCheck.h b/clang-tidy/misc/SizeofContainerCheck.h index c17bbbd0..ed13ca56 100644 --- a/clang-tidy/misc/SizeofContainerCheck.h +++ b/clang-tidy/misc/SizeofContainerCheck.h @@ -34,4 +34,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_SIZEOF_CONTAINER_H - diff --git a/clang-tidy/misc/SizeofExpressionCheck.cpp b/clang-tidy/misc/SizeofExpressionCheck.cpp index ea40b2cf..5b8e7e76 100644 --- a/clang-tidy/misc/SizeofExpressionCheck.cpp +++ b/clang-tidy/misc/SizeofExpressionCheck.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #include "SizeofExpressionCheck.h" +#include "../utils/Matchers.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" -#include "../utils/Matchers.h" using namespace clang::ast_matchers; diff --git a/clang-tidy/misc/StringIntegerAssignmentCheck.h b/clang-tidy/misc/StringIntegerAssignmentCheck.h index 7d89c0c1..7963362a 100644 --- a/clang-tidy/misc/StringIntegerAssignmentCheck.h +++ b/clang-tidy/misc/StringIntegerAssignmentCheck.h @@ -33,4 +33,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_STRING_INTEGER_ASSIGNMENT_H - diff --git a/clang-tidy/misc/SuspiciousMissingCommaCheck.cpp b/clang-tidy/misc/SuspiciousMissingCommaCheck.cpp index 605cfd97..a3ed38fb 100644 --- a/clang-tidy/misc/SuspiciousMissingCommaCheck.cpp +++ b/clang-tidy/misc/SuspiciousMissingCommaCheck.cpp @@ -19,8 +19,8 @@ namespace misc { namespace { -bool isConcatenatedLiteralsOnPurpose(ASTContext* Ctx, - const StringLiteral* Lit) { +bool isConcatenatedLiteralsOnPurpose(ASTContext *Ctx, + const StringLiteral *Lit) { // String literals surrounded by parentheses are assumed to be on purpose. // i.e.: const char* Array[] = { ("a" "b" "c"), "d", [...] }; auto Parents = Ctx->getParents(*Lit); @@ -36,13 +36,13 @@ bool isConcatenatedLiteralsOnPurpose(ASTContext* Ctx, // "second literal", // [...] // }; - const SourceManager& SM = Ctx->getSourceManager(); + const SourceManager &SM = Ctx->getSourceManager(); bool IndentedCorrectly = true; SourceLocation FirstToken = Lit->getStrTokenLoc(0); FileID BaseFID = SM.getFileID(FirstToken); unsigned int BaseIndent = SM.getSpellingColumnNumber(FirstToken); unsigned int BaseLine = SM.getSpellingLineNumber(FirstToken); - for (unsigned int TokNum = 1; TokNum < Lit->getNumConcatenated(); ++ TokNum) { + for (unsigned int TokNum = 1; TokNum < Lit->getNumConcatenated(); ++TokNum) { SourceLocation Token = Lit->getStrTokenLoc(TokNum); FileID FID = SM.getFileID(Token); unsigned int Indent = SM.getSpellingColumnNumber(Token); @@ -59,14 +59,14 @@ bool isConcatenatedLiteralsOnPurpose(ASTContext* Ctx, return false; } -AST_MATCHER_P(StringLiteral, isConcatenatedLiteral, - unsigned, MaxConcatenatedTokens) { +AST_MATCHER_P(StringLiteral, isConcatenatedLiteral, unsigned, + MaxConcatenatedTokens) { return Node.getNumConcatenated() > 1 && Node.getNumConcatenated() < MaxConcatenatedTokens && !isConcatenatedLiteralsOnPurpose(&Finder->getASTContext(), &Node); } -} // namespace +} // namespace SuspiciousMissingCommaCheck::SuspiciousMissingCommaCheck( StringRef Name, ClangTidyContext *Context) @@ -102,25 +102,28 @@ void SuspiciousMissingCommaCheck::check( // Skip small arrays as they often generate false-positive. unsigned int Size = InitializerList->getNumInits(); - if (Size < SizeThreshold) return; + if (Size < SizeThreshold) + return; // Count the number of occurence of concatenated string literal. unsigned int Count = 0; for (unsigned int i = 0; i < Size; ++i) { const Expr *Child = InitializerList->getInit(i)->IgnoreImpCasts(); if (const auto *Literal = dyn_cast<StringLiteral>(Child)) { - if (Literal->getNumConcatenated() > 1) ++Count; + if (Literal->getNumConcatenated() > 1) + ++Count; } } // Warn only when concatenation is not common in this initializer list. // The current threshold is set to less than 1/5 of the string literals. - if (double(Count) / Size > RatioThreshold) return; + if (double(Count) / Size > RatioThreshold) + return; diag(ConcatenatedLiteral->getLocStart(), "suspicious string literal, probably missing a comma"); } -} // namespace misc -} // namespace tidy -} // namespace clang +} // namespace misc +} // namespace tidy +} // namespace clang diff --git a/clang-tidy/misc/SuspiciousMissingCommaCheck.h b/clang-tidy/misc/SuspiciousMissingCommaCheck.h index 42849594..bf74ad11 100644 --- a/clang-tidy/misc/SuspiciousMissingCommaCheck.h +++ b/clang-tidy/misc/SuspiciousMissingCommaCheck.h @@ -16,7 +16,8 @@ namespace clang { namespace tidy { namespace misc { -/// This check finds string literals which are probably concatenated accidentally. +/// This check finds string literals which are probably concatenated +/// accidentally. /// /// For the user-facing documentation see: /// http://clang.llvm.org/extra/clang-tidy/checks/misc-suspicious-missing-comma.html diff --git a/clang-tidy/misc/SuspiciousStringCompareCheck.cpp b/clang-tidy/misc/SuspiciousStringCompareCheck.cpp index 7e01e647..641200cb 100644 --- a/clang-tidy/misc/SuspiciousStringCompareCheck.cpp +++ b/clang-tidy/misc/SuspiciousStringCompareCheck.cpp @@ -20,7 +20,6 @@ namespace clang { namespace tidy { namespace misc { - // Semicolon separated list of known string compare-like functions. The list // must ends with a semicolon. static const char KnownStringCompareFunctions[] = "__builtin_memcmp;" @@ -104,13 +103,12 @@ void SuspiciousStringCompareCheck::registerMatchers(MatchFinder *Finder) { .bind("decl"); const auto DirectStringCompareCallExpr = callExpr(hasDeclaration(FunctionCompareDecl)).bind("call"); - const auto MacroStringCompareCallExpr = - conditionalOperator( - anyOf(hasTrueExpression(ignoringParenImpCasts(DirectStringCompareCallExpr)), - hasFalseExpression(ignoringParenImpCasts(DirectStringCompareCallExpr)))); + const auto MacroStringCompareCallExpr = conditionalOperator(anyOf( + hasTrueExpression(ignoringParenImpCasts(DirectStringCompareCallExpr)), + hasFalseExpression(ignoringParenImpCasts(DirectStringCompareCallExpr)))); // The implicit cast is not present in C. const auto StringCompareCallExpr = ignoringParenImpCasts( - anyOf(DirectStringCompareCallExpr, MacroStringCompareCallExpr)); + anyOf(DirectStringCompareCallExpr, MacroStringCompareCallExpr)); if (WarnOnImplicitComparison) { // Detect suspicious calls to string compare: @@ -203,7 +201,8 @@ void SuspiciousStringCompareCheck::check( << Decl; } - if (const auto* BinOp = Result.Nodes.getNodeAs<BinaryOperator>("suspicious-operator")) { + if (const auto *BinOp = + Result.Nodes.getNodeAs<BinaryOperator>("suspicious-operator")) { diag(Call->getLocStart(), "results of function %0 used by operator '%1'") << Decl << BinOp->getOpcodeStr(); } diff --git a/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp b/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp index 8b8c379a..e6177ba8 100644 --- a/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp +++ b/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp @@ -9,8 +9,8 @@ #include "ThrowByValueCatchByReferenceCheck.h" #include "clang/AST/ASTContext.h" -#include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/AST/OperationKinds.h" +#include "clang/ASTMatchers/ASTMatchFinder.h" using namespace clang::ast_matchers; diff --git a/clang-tidy/misc/UnconventionalAssignOperatorCheck.cpp b/clang-tidy/misc/UnconventionalAssignOperatorCheck.cpp index 51c23964..841f13d5 100644 --- a/clang-tidy/misc/UnconventionalAssignOperatorCheck.cpp +++ b/clang-tidy/misc/UnconventionalAssignOperatorCheck.cpp @@ -17,7 +17,8 @@ namespace clang { namespace tidy { namespace misc { -void UnconventionalAssignOperatorCheck::registerMatchers(ast_matchers::MatchFinder *Finder) { +void UnconventionalAssignOperatorCheck::registerMatchers( + ast_matchers::MatchFinder *Finder) { // Only register the matchers for C++; the functionality currently does not // provide any benefit to other languages, despite being benign. if (!getLangOpts().CPlusPlus) @@ -65,7 +66,8 @@ void UnconventionalAssignOperatorCheck::registerMatchers(ast_matchers::MatchFind this); } -void UnconventionalAssignOperatorCheck::check(const MatchFinder::MatchResult &Result) { +void UnconventionalAssignOperatorCheck::check( + const MatchFinder::MatchResult &Result) { if (const auto *RetStmt = Result.Nodes.getNodeAs<ReturnStmt>("returnStmt")) { diag(RetStmt->getLocStart(), "operator=() should always return '*this'"); } else { diff --git a/clang-tidy/misc/UndelegatedConstructor.cpp b/clang-tidy/misc/UndelegatedConstructor.cpp index 3b6f1985..003290ee 100644 --- a/clang-tidy/misc/UndelegatedConstructor.cpp +++ b/clang-tidy/misc/UndelegatedConstructor.cpp @@ -72,7 +72,8 @@ void UndelegatedConstructorCheck::registerMatchers(MatchFinder *Finder) { this); } -void UndelegatedConstructorCheck::check(const MatchFinder::MatchResult &Result) { +void UndelegatedConstructorCheck::check( + const MatchFinder::MatchResult &Result) { const auto *E = Result.Nodes.getStmtAs<CXXConstructExpr>("construct"); diag(E->getLocStart(), "did you intend to call a delegated constructor? " "A temporary object is created here instead"); diff --git a/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp b/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp index 78dba5a9..99758d33 100644 --- a/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp +++ b/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp @@ -91,7 +91,7 @@ bool areDeletersCompatible(const MatchFinder::MatchResult &Result) { return false; } -} // namespace +} // namespace void UniqueptrResetReleaseCheck::check(const MatchFinder::MatchResult &Result) { if (!areDeletersCompatible(Result)) @@ -127,9 +127,8 @@ void UniqueptrResetReleaseCheck::check(const MatchFinder::MatchResult &Result) { } std::string NewText = LeftText + " = " + RightText; - diag(ResetMember->getExprLoc(), DiagText) - << FixItHint::CreateReplacement( - CharSourceRange::getTokenRange(ResetCall->getSourceRange()), NewText); + diag(ResetMember->getExprLoc(), DiagText) << FixItHint::CreateReplacement( + CharSourceRange::getTokenRange(ResetCall->getSourceRange()), NewText); } } // namespace misc diff --git a/clang-tidy/misc/UnusedAliasDeclsCheck.h b/clang-tidy/misc/UnusedAliasDeclsCheck.h index 0525ba84..8cce3756 100644 --- a/clang-tidy/misc/UnusedAliasDeclsCheck.h +++ b/clang-tidy/misc/UnusedAliasDeclsCheck.h @@ -35,4 +35,3 @@ private: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_ALIAS_DECLS_H - diff --git a/clang-tidy/misc/UnusedParametersCheck.cpp b/clang-tidy/misc/UnusedParametersCheck.cpp index 6131132b..6c60edee 100644 --- a/clang-tidy/misc/UnusedParametersCheck.cpp +++ b/clang-tidy/misc/UnusedParametersCheck.cpp @@ -107,8 +107,7 @@ void UnusedParametersCheck::warnOnUnusedParameter( void UnusedParametersCheck::check(const MatchFinder::MatchResult &Result) { const auto *Function = Result.Nodes.getNodeAs<FunctionDecl>("function"); if (!Function->doesThisDeclarationHaveABody() || - !Function->hasWrittenPrototype() || - Function->isTemplateInstantiation()) + !Function->hasWrittenPrototype() || Function->isTemplateInstantiation()) return; if (const auto *Method = dyn_cast<CXXMethodDecl>(Function)) if (Method->isLambdaStaticInvoker()) diff --git a/clang-tidy/misc/UnusedParametersCheck.h b/clang-tidy/misc/UnusedParametersCheck.h index f8b27dee..334f8971 100644 --- a/clang-tidy/misc/UnusedParametersCheck.h +++ b/clang-tidy/misc/UnusedParametersCheck.h @@ -36,4 +36,3 @@ private: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_PARAMETERS_H - diff --git a/clang-tidy/misc/UnusedUsingDeclsCheck.cpp b/clang-tidy/misc/UnusedUsingDeclsCheck.cpp index 11dd5962..09d32346 100644 --- a/clang-tidy/misc/UnusedUsingDeclsCheck.cpp +++ b/clang-tidy/misc/UnusedUsingDeclsCheck.cpp @@ -42,8 +42,9 @@ void UnusedUsingDeclsCheck::registerMatchers(MatchFinder *Finder) { anyOf(refersToTemplate(templateName().bind("used")), refersToDeclaration(functionDecl().bind("used"))))))), this); - Finder->addMatcher(loc(templateSpecializationType( - hasAnyTemplateArgument(templateArgument().bind("used")))), this); + Finder->addMatcher(loc(templateSpecializationType(hasAnyTemplateArgument( + templateArgument().bind("used")))), + this); } void UnusedUsingDeclsCheck::check(const MatchFinder::MatchResult &Result) { @@ -126,7 +127,7 @@ void UnusedUsingDeclsCheck::check(const MatchFinder::MatchResult &Result) { } // Check the uninstantiated template function usage. if (const auto *ULE = Result.Nodes.getNodeAs<UnresolvedLookupExpr>("used")) { - for (const NamedDecl* ND : ULE->decls()) { + for (const NamedDecl *ND : ULE->decls()) { if (const auto *USD = dyn_cast<UsingShadowDecl>(ND)) removeFromFoundDecls(USD->getTargetDecl()->getCanonicalDecl()); } diff --git a/clang-tidy/misc/UseAfterMoveCheck.cpp b/clang-tidy/misc/UseAfterMoveCheck.cpp index 189495ad..ab68b184 100644 --- a/clang-tidy/misc/UseAfterMoveCheck.cpp +++ b/clang-tidy/misc/UseAfterMoveCheck.cpp @@ -604,8 +604,7 @@ void UseAfterMoveFinder::getReinits( } } -static void emitDiagnostic(const Expr *MovingCall, - const DeclRefExpr *MoveArg, +static void emitDiagnostic(const Expr *MovingCall, const DeclRefExpr *MoveArg, const UseAfterMove &Use, ClangTidyCheck *Check, ASTContext *Context) { SourceLocation UseLoc = Use.DeclRef->getExprLoc(); @@ -631,12 +630,11 @@ void UseAfterMoveCheck::registerMatchers(MatchFinder *Finder) { return; auto CallMoveMatcher = - callExpr( - callee(functionDecl(hasName("::std::move"))), argumentCountIs(1), - hasArgument(0, declRefExpr().bind("arg")), - anyOf(hasAncestor(lambdaExpr().bind("containing-lambda")), - hasAncestor(functionDecl().bind("containing-func"))), - unless(inDecltypeOrTemplateArg())) + callExpr(callee(functionDecl(hasName("::std::move"))), argumentCountIs(1), + hasArgument(0, declRefExpr().bind("arg")), + anyOf(hasAncestor(lambdaExpr().bind("containing-lambda")), + hasAncestor(functionDecl().bind("containing-func"))), + unless(inDecltypeOrTemplateArg())) .bind("call-move"); Finder->addMatcher( diff --git a/clang-tidy/modernize/AvoidBindCheck.cpp b/clang-tidy/modernize/AvoidBindCheck.cpp index 2b9a4827..b1e07905 100644 --- a/clang-tidy/modernize/AvoidBindCheck.cpp +++ b/clang-tidy/modernize/AvoidBindCheck.cpp @@ -154,7 +154,7 @@ void AvoidBindCheck::check(const MatchFinder::MatchResult &Result) { addPlaceholderArgs(Args, Stream); Stream << " { return "; Ref->printPretty(Stream, nullptr, Result.Context->getPrintingPolicy()); - Stream<< "("; + Stream << "("; addFunctionCallArgs(Args, Stream); Stream << "); };"; diff --git a/clang-tidy/modernize/MakeUniqueCheck.h b/clang-tidy/modernize/MakeUniqueCheck.h index b939633d..15fbd556 100644 --- a/clang-tidy/modernize/MakeUniqueCheck.h +++ b/clang-tidy/modernize/MakeUniqueCheck.h @@ -38,4 +38,3 @@ protected: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_MAKE_UNIQUE_H - diff --git a/clang-tidy/modernize/ModernizeTidyModule.cpp b/clang-tidy/modernize/ModernizeTidyModule.cpp index 15c9a578..3fa23daa 100644 --- a/clang-tidy/modernize/ModernizeTidyModule.cpp +++ b/clang-tidy/modernize/ModernizeTidyModule.cpp @@ -37,8 +37,7 @@ namespace modernize { class ModernizeModule : public ClangTidyModule { public: void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { - CheckFactories.registerCheck<AvoidBindCheck>( - "modernize-avoid-bind"); + CheckFactories.registerCheck<AvoidBindCheck>("modernize-avoid-bind"); CheckFactories.registerCheck<DeprecatedHeadersCheck>( "modernize-deprecated-headers"); CheckFactories.registerCheck<LoopConvertCheck>("modernize-loop-convert"); diff --git a/clang-tidy/modernize/RawStringLiteralCheck.cpp b/clang-tidy/modernize/RawStringLiteralCheck.cpp index 8d893ad3..452c3dd8 100644 --- a/clang-tidy/modernize/RawStringLiteralCheck.cpp +++ b/clang-tidy/modernize/RawStringLiteralCheck.cpp @@ -133,7 +133,7 @@ void RawStringLiteralCheck::replaceWithRawStringLiteral( diag(Literal->getLocStart(), "escaped string literal can be written as a raw string literal") << FixItHint::CreateReplacement( - CharRange, asRawStringLiteral(Literal, DelimiterStem)); + CharRange, asRawStringLiteral(Literal, DelimiterStem)); } } // namespace modernize diff --git a/clang-tidy/modernize/UseAutoCheck.cpp b/clang-tidy/modernize/UseAutoCheck.cpp index 29d21f07..e2ddceb3 100644 --- a/clang-tidy/modernize/UseAutoCheck.cpp +++ b/clang-tidy/modernize/UseAutoCheck.cpp @@ -9,8 +9,8 @@ #include "UseAutoCheck.h" #include "clang/AST/ASTContext.h" -#include "clang/ASTMatchers/ASTMatchers.h" #include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/ASTMatchers/ASTMatchers.h" using namespace clang; using namespace clang::ast_matchers; @@ -114,20 +114,19 @@ AST_MATCHER(NamedDecl, hasStdIteratorName) { /// recordDecl(hasStdContainerName()) matches \c vector and \c forward_list /// but not \c my_vec. AST_MATCHER(NamedDecl, hasStdContainerName) { - static const char *const ContainerNames[] = {"array", "deque", - "forward_list", "list", - "vector", + static const char *const ContainerNames[] = { + "array", "deque", + "forward_list", "list", + "vector", - "map", "multimap", - "set", "multiset", + "map", "multimap", + "set", "multiset", - "unordered_map", - "unordered_multimap", - "unordered_set", - "unordered_multiset", + "unordered_map", "unordered_multimap", + "unordered_set", "unordered_multiset", - "queue", "priority_queue", - "stack"}; + "queue", "priority_queue", + "stack"}; for (const char *Name : ContainerNames) { if (hasName(Name).matches(Node, Finder, Builder)) diff --git a/clang-tidy/modernize/UseDefaultCheck.h b/clang-tidy/modernize/UseDefaultCheck.h index 74a9b5e5..aa1859d8 100644 --- a/clang-tidy/modernize/UseDefaultCheck.h +++ b/clang-tidy/modernize/UseDefaultCheck.h @@ -48,4 +48,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USE_DEFAULT_H - diff --git a/clang-tidy/modernize/UseNullptrCheck.cpp b/clang-tidy/modernize/UseNullptrCheck.cpp index 401b10b7..16b6f20d 100644 --- a/clang-tidy/modernize/UseNullptrCheck.cpp +++ b/clang-tidy/modernize/UseNullptrCheck.cpp @@ -38,8 +38,7 @@ AST_MATCHER(Type, sugaredNullptrType) { /// can be replaced instead of just the inner-most implicit cast. StatementMatcher makeCastSequenceMatcher() { StatementMatcher ImplicitCastToNull = implicitCastExpr( - anyOf(hasCastKind(CK_NullToPointer), - hasCastKind(CK_NullToMemberPointer)), + anyOf(hasCastKind(CK_NullToPointer), hasCastKind(CK_NullToMemberPointer)), unless(hasSourceExpression(hasType(sugaredNullptrType())))); return castExpr(anyOf(ImplicitCastToNull, diff --git a/clang-tidy/mpi/TypeMismatchCheck.h b/clang-tidy/mpi/TypeMismatchCheck.h index 699110a9..dd56c465 100644 --- a/clang-tidy/mpi/TypeMismatchCheck.h +++ b/clang-tidy/mpi/TypeMismatchCheck.h @@ -41,8 +41,7 @@ private: /// \param LO language options void checkArguments(ArrayRef<const Type *> BufferTypes, ArrayRef<const Expr *> BufferExprs, - ArrayRef<StringRef> MPIDatatypes, - const LangOptions &LO); + ArrayRef<StringRef> MPIDatatypes, const LangOptions &LO); }; } // namespace mpi diff --git a/clang-tidy/performance/FasterStringFindCheck.cpp b/clang-tidy/performance/FasterStringFindCheck.cpp index ab2dff48..a8a9f662 100644 --- a/clang-tidy/performance/FasterStringFindCheck.cpp +++ b/clang-tidy/performance/FasterStringFindCheck.cpp @@ -30,10 +30,12 @@ llvm::Optional<std::string> MakeCharacterLiteral(const StringLiteral *Literal) { } // Now replace the " with '. auto pos = Result.find_first_of('"'); - if (pos == Result.npos) return llvm::None; + if (pos == Result.npos) + return llvm::None; Result[pos] = '\''; pos = Result.find_last_of('"'); - if (pos == Result.npos) return llvm::None; + if (pos == Result.npos) + return llvm::None; Result[pos] = '\''; return Result; } @@ -50,8 +52,7 @@ FasterStringFindCheck::FasterStringFindCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context), StringLikeClasses(utils::options::parseStringList( - Options.get("StringLikeClasses", "std::basic_string"))) { -} + Options.get("StringLikeClasses", "std::basic_string"))) {} void FasterStringFindCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { Options.store(Opts, "StringLikeClasses", diff --git a/clang-tidy/performance/ImplicitCastInLoopCheck.cpp b/clang-tidy/performance/ImplicitCastInLoopCheck.cpp index 3fcfdba5..7bd3f8a3 100644 --- a/clang-tidy/performance/ImplicitCastInLoopCheck.cpp +++ b/clang-tidy/performance/ImplicitCastInLoopCheck.cpp @@ -29,7 +29,7 @@ namespace { bool IsNonTrivialImplicitCast(const Stmt *ST) { if (const auto *ICE = dyn_cast<ImplicitCastExpr>(ST)) { return (ICE->getCastKind() != CK_NoOp) || - IsNonTrivialImplicitCast(ICE->getSubExpr()); + IsNonTrivialImplicitCast(ICE->getSubExpr()); } return false; } diff --git a/clang-tidy/performance/ImplicitCastInLoopCheck.h b/clang-tidy/performance/ImplicitCastInLoopCheck.h index 913ee96d..3a9659d6 100644 --- a/clang-tidy/performance/ImplicitCastInLoopCheck.h +++ b/clang-tidy/performance/ImplicitCastInLoopCheck.h @@ -20,13 +20,13 @@ namespace performance { // the underlying type is the one returned by the iterator (i.e. that there // isn't any implicit conversion). class ImplicitCastInLoopCheck : public ClangTidyCheck { - public: - ImplicitCastInLoopCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context) {} - void registerMatchers(ast_matchers::MatchFinder *Finder) override; - void check(const ast_matchers::MatchFinder::MatchResult &Result) override; +public: + ImplicitCastInLoopCheck(StringRef Name, ClangTidyContext *Context) + : ClangTidyCheck(Name, Context) {} + void registerMatchers(ast_matchers::MatchFinder *Finder) override; + void check(const ast_matchers::MatchFinder::MatchResult &Result) override; - private: +private: void ReportAndFix(const ASTContext *Context, const VarDecl *VD, const CXXOperatorCallExpr *OperatorCall); }; @@ -35,4 +35,4 @@ class ImplicitCastInLoopCheck : public ClangTidyCheck { } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_PERFORMANCE_IMPLICIT_CAST_IN_LOOP_CHECK_H_ +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_PERFORMANCE_IMPLICIT_CAST_IN_LOOP_CHECK_H_ diff --git a/clang-tidy/performance/UnnecessaryCopyInitialization.cpp b/clang-tidy/performance/UnnecessaryCopyInitialization.cpp index 66773a65..177497c4 100644 --- a/clang-tidy/performance/UnnecessaryCopyInitialization.cpp +++ b/clang-tidy/performance/UnnecessaryCopyInitialization.cpp @@ -27,7 +27,6 @@ void recordFixes(const VarDecl &Var, ASTContext &Context, } // namespace - using namespace ::clang::ast_matchers; using utils::decl_ref_expr::isOnlyUsedAsConst; @@ -44,9 +43,9 @@ void UnnecessaryCopyInitialization::registerMatchers(MatchFinder *Finder) { // variable being declared. The assumption is that the const reference being // returned either points to a global static variable or to a member of the // called object. - auto ConstRefReturningMethodCall = cxxMemberCallExpr( - callee(cxxMethodDecl(returns(ConstReference))), - on(declRefExpr(to(varDecl().bind("objectArg"))))); + auto ConstRefReturningMethodCall = + cxxMemberCallExpr(callee(cxxMethodDecl(returns(ConstReference))), + on(declRefExpr(to(varDecl().bind("objectArg"))))); auto ConstRefReturningFunctionCall = callExpr(callee(functionDecl(returns(ConstReference))), unless(callee(cxxMethodDecl()))); @@ -64,14 +63,14 @@ void UnnecessaryCopyInitialization::registerMatchers(MatchFinder *Finder) { isCopyConstructor())), hasArgument(0, CopyCtorArg)) .bind("ctorCall"))) - .bind("newVarDecl"))).bind("declStmt"))) + .bind("newVarDecl"))) + .bind("declStmt"))) .bind("blockStmt"); }; - Finder->addMatcher( - localVarCopiedFrom(anyOf(ConstRefReturningFunctionCall, - ConstRefReturningMethodCall)), - this); + Finder->addMatcher(localVarCopiedFrom(anyOf(ConstRefReturningFunctionCall, + ConstRefReturningMethodCall)), + this); Finder->addMatcher(localVarCopiedFrom(declRefExpr( to(varDecl(hasLocalStorage()).bind("oldVarDecl")))), diff --git a/clang-tidy/performance/UnnecessaryValueParamCheck.cpp b/clang-tidy/performance/UnnecessaryValueParamCheck.cpp index 1d229cf1..672c81ff 100644 --- a/clang-tidy/performance/UnnecessaryValueParamCheck.cpp +++ b/clang-tidy/performance/UnnecessaryValueParamCheck.cpp @@ -127,7 +127,7 @@ void UnnecessaryValueParamCheck::check(const MatchFinder::MatchResult &Result) { FunctionDecl = FunctionDecl->getPreviousDecl()) { const auto &CurrentParam = *FunctionDecl->getParamDecl(Index); Diag << utils::fixit::changeVarDeclToReference(CurrentParam, - *Result.Context); + *Result.Context); // The parameter of each declaration needs to be checked individually as to // whether it is const or not as constness can differ between definition and // declaration. diff --git a/clang-tidy/readability/AvoidConstParamsInDecls.cpp b/clang-tidy/readability/AvoidConstParamsInDecls.cpp index ca2411cf..70329e83 100644 --- a/clang-tidy/readability/AvoidConstParamsInDecls.cpp +++ b/clang-tidy/readability/AvoidConstParamsInDecls.cpp @@ -8,10 +8,10 @@ //===----------------------------------------------------------------------===// #include "AvoidConstParamsInDecls.h" -#include "llvm/ADT/Optional.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/ASTMatchers/ASTMatchers.h" #include "clang/Lex/Lexer.h" +#include "llvm/ADT/Optional.h" using namespace clang::ast_matchers; diff --git a/clang-tidy/readability/BracesAroundStatementsCheck.cpp b/clang-tidy/readability/BracesAroundStatementsCheck.cpp index 5186c0b1..4dea41df 100644 --- a/clang-tidy/readability/BracesAroundStatementsCheck.cpp +++ b/clang-tidy/readability/BracesAroundStatementsCheck.cpp @@ -117,8 +117,8 @@ BracesAroundStatementsCheck::BracesAroundStatementsCheck( // Always add braces by default. ShortStatementLines(Options.get("ShortStatementLines", 0U)) {} -void -BracesAroundStatementsCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { +void BracesAroundStatementsCheck::storeOptions( + ClangTidyOptions::OptionMap &Opts) { Options.store(Opts, "ShortStatementLines", ShortStatementLines); } @@ -130,8 +130,8 @@ void BracesAroundStatementsCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher(cxxForRangeStmt().bind("for-range"), this); } -void -BracesAroundStatementsCheck::check(const MatchFinder::MatchResult &Result) { +void BracesAroundStatementsCheck::check( + const MatchFinder::MatchResult &Result) { const SourceManager &SM = *Result.SourceManager; const ASTContext *Context = Result.Context; diff --git a/clang-tidy/readability/BracesAroundStatementsCheck.h b/clang-tidy/readability/BracesAroundStatementsCheck.h index 12d7b37a..919ca463 100644 --- a/clang-tidy/readability/BracesAroundStatementsCheck.h +++ b/clang-tidy/readability/BracesAroundStatementsCheck.h @@ -58,7 +58,7 @@ private: const ASTContext *Context); private: - std::set<const Stmt*> ForceBracesStmts; + std::set<const Stmt *> ForceBracesStmts; const unsigned ShortStatementLines; }; diff --git a/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tidy/readability/IdentifierNamingCheck.cpp index f3b29302..f73bc37e 100644 --- a/clang-tidy/readability/IdentifierNamingCheck.cpp +++ b/clang-tidy/readability/IdentifierNamingCheck.cpp @@ -9,13 +9,13 @@ #include "IdentifierNamingCheck.h" -#include "llvm/ADT/DenseMapInfo.h" -#include "llvm/Support/Debug.h" -#include "llvm/Support/Format.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/Preprocessor.h" +#include "llvm/ADT/DenseMapInfo.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/Format.h" #define DEBUG_TYPE "clang-tidy" @@ -662,7 +662,8 @@ static void addUsage(IdentifierNamingCheck::NamingCheckFailureMap &Failures, /// Convenience method when the usage to be added is a NamedDecl static void addUsage(IdentifierNamingCheck::NamingCheckFailureMap &Failures, - const NamedDecl *Decl, SourceRange Range, SourceManager *SourceMgr = nullptr) { + const NamedDecl *Decl, SourceRange Range, + SourceManager *SourceMgr = nullptr) { return addUsage(Failures, IdentifierNamingCheck::NamingCheckId( Decl->getLocation(), Decl->getNameAsString()), Range, SourceMgr); @@ -752,7 +753,8 @@ void IdentifierNamingCheck::check(const MatchFinder::MatchResult &Result) { if (const auto *DeclRef = Result.Nodes.getNodeAs<DeclRefExpr>("declRef")) { SourceRange Range = DeclRef->getNameInfo().getSourceRange(); - addUsage(NamingCheckFailures, DeclRef->getDecl(), Range, Result.SourceManager); + addUsage(NamingCheckFailures, DeclRef->getDecl(), Range, + Result.SourceManager); return; } diff --git a/clang-tidy/readability/ImplicitBoolCastCheck.cpp b/clang-tidy/readability/ImplicitBoolCastCheck.cpp index 38e4098f..a8fc5d13 100644 --- a/clang-tidy/readability/ImplicitBoolCastCheck.cpp +++ b/clang-tidy/readability/ImplicitBoolCastCheck.cpp @@ -307,8 +307,7 @@ ImplicitBoolCastCheck::ImplicitBoolCastCheck(StringRef Name, AllowConditionalPointerCasts( Options.get("AllowConditionalPointerCasts", false)) {} -void ImplicitBoolCastCheck::storeOptions( - ClangTidyOptions::OptionMap &Opts) { +void ImplicitBoolCastCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { Options.store(Opts, "AllowConditionalIntegerCasts", AllowConditionalIntegerCasts); Options.store(Opts, "AllowConditionalPointerCasts", diff --git a/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp b/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp index e3e82d71..d20416e8 100644 --- a/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp +++ b/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp @@ -110,7 +110,8 @@ findDifferingParamsInDeclaration(const FunctionDecl *ParameterSourceDeclaration, SourceParamName != OtherParamName) { SourceRange OtherParamNameRange = DeclarationNameInfo((*OtherParamIt)->getDeclName(), - (*OtherParamIt)->getLocation()).getSourceRange(); + (*OtherParamIt)->getLocation()) + .getSourceRange(); bool GenerateFixItHint = checkIfFixItHintIsApplicable( ParameterSourceDeclaration, *SourceParamIt, OriginalDeclaration); @@ -202,13 +203,15 @@ std::string joinParameterNames( } void formatDifferingParamsDiagnostic( - InconsistentDeclarationParameterNameCheck *Check, - SourceLocation Location, StringRef OtherDeclarationDescription, + InconsistentDeclarationParameterNameCheck *Check, SourceLocation Location, + StringRef OtherDeclarationDescription, const DifferingParamsContainer &DifferingParams) { - auto ChooseOtherName = - [](const DifferingParamInfo &ParamInfo) { return ParamInfo.OtherName; }; - auto ChooseSourceName = - [](const DifferingParamInfo &ParamInfo) { return ParamInfo.SourceName; }; + auto ChooseOtherName = [](const DifferingParamInfo &ParamInfo) { + return ParamInfo.OtherName; + }; + auto ChooseSourceName = [](const DifferingParamInfo &ParamInfo) { + return ParamInfo.SourceName; + }; auto ParamDiag = Check->diag(Location, diff --git a/clang-tidy/readability/NamespaceCommentCheck.cpp b/clang-tidy/readability/NamespaceCommentCheck.cpp index 402bf510..b7a218ae 100644 --- a/clang-tidy/readability/NamespaceCommentCheck.cpp +++ b/clang-tidy/readability/NamespaceCommentCheck.cpp @@ -114,7 +114,8 @@ void NamespaceCommentCheck::check(const MatchFinder::MatchResult &Result) { Message = (llvm::Twine( "%0 ends with a comment that refers to a wrong namespace '") + - NamespaceNameInComment + "'").str(); + NamespaceNameInComment + "'") + .str(); } else if (Comment.startswith("//")) { // Assume that this is an unrecognized form of a namespace closing line // comment. Replace it. diff --git a/clang-tidy/readability/RedundantControlFlowCheck.cpp b/clang-tidy/readability/RedundantControlFlowCheck.cpp index 4f8f8d17..0788c42e 100644 --- a/clang-tidy/readability/RedundantControlFlowCheck.cpp +++ b/clang-tidy/readability/RedundantControlFlowCheck.cpp @@ -33,9 +33,10 @@ bool isLocationInMacroExpansion(const SourceManager &SM, SourceLocation Loc) { void RedundantControlFlowCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher( - functionDecl(isDefinition(), returns(voidType()), - has(compoundStmt(hasAnySubstatement(returnStmt( - unless(has(expr()))))).bind("return"))), + functionDecl( + isDefinition(), returns(voidType()), + has(compoundStmt(hasAnySubstatement(returnStmt(unless(has(expr()))))) + .bind("return"))), this); auto CompoundContinue = has(compoundStmt(hasAnySubstatement(continueStmt())).bind("continue")); diff --git a/clang-tidy/readability/RedundantDeclarationCheck.cpp b/clang-tidy/readability/RedundantDeclarationCheck.cpp index 44aa7a5a..ea7d8168 100644 --- a/clang-tidy/readability/RedundantDeclarationCheck.cpp +++ b/clang-tidy/readability/RedundantDeclarationCheck.cpp @@ -19,7 +19,8 @@ namespace tidy { namespace readability { void RedundantDeclarationCheck::registerMatchers(MatchFinder *Finder) { - Finder->addMatcher(namedDecl(anyOf(varDecl(), functionDecl())).bind("Decl"), this); + Finder->addMatcher(namedDecl(anyOf(varDecl(), functionDecl())).bind("Decl"), + this); } void RedundantDeclarationCheck::check(const MatchFinder::MatchResult &Result) { @@ -33,8 +34,8 @@ void RedundantDeclarationCheck::check(const MatchFinder::MatchResult &Result) { const SourceManager &SM = *Result.SourceManager; const bool DifferentHeaders = - !SM.isInMainFile(D->getLocation()) && - !SM.isWrittenInSameFile(Prev->getLocation(), D->getLocation()); + !SM.isInMainFile(D->getLocation()) && + !SM.isWrittenInSameFile(Prev->getLocation(), D->getLocation()); bool MultiVar = false; if (const auto *VD = dyn_cast<VarDecl>(D)) { @@ -57,8 +58,7 @@ void RedundantDeclarationCheck::check(const MatchFinder::MatchResult &Result) { SourceLocation EndLoc = Lexer::getLocForEndOfToken( D->getSourceRange().getEnd(), 0, SM, Result.Context->getLangOpts()); { - auto Diag = diag(D->getLocation(), "redundant %0 declaration") - << D; + auto Diag = diag(D->getLocation(), "redundant %0 declaration") << D; if (!MultiVar && !DifferentHeaders) Diag << FixItHint::CreateRemoval( SourceRange(D->getSourceRange().getBegin(), EndLoc)); diff --git a/clang-tidy/readability/RedundantMemberInitCheck.cpp b/clang-tidy/readability/RedundantMemberInitCheck.cpp index 0259c342..26003e6c 100644 --- a/clang-tidy/readability/RedundantMemberInitCheck.cpp +++ b/clang-tidy/readability/RedundantMemberInitCheck.cpp @@ -8,10 +8,10 @@ //===----------------------------------------------------------------------===// #include "RedundantMemberInitCheck.h" +#include "../utils/Matchers.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Lex/Lexer.h" -#include "../utils/Matchers.h" #include <algorithm> using namespace clang::ast_matchers; diff --git a/clang-tidy/readability/RedundantStringCStrCheck.cpp b/clang-tidy/readability/RedundantStringCStrCheck.cpp index 5b0e4ca2..8f086b87 100644 --- a/clang-tidy/readability/RedundantStringCStrCheck.cpp +++ b/clang-tidy/readability/RedundantStringCStrCheck.cpp @@ -77,17 +77,14 @@ void RedundantStringCStrCheck::registerMatchers( return; // Match expressions of type 'string' or 'string*'. - const auto StringDecl = - cxxRecordDecl(hasName("::std::basic_string")); + const auto StringDecl = cxxRecordDecl(hasName("::std::basic_string")); const auto StringExpr = - expr(anyOf(hasType(StringDecl), - hasType(qualType(pointsTo(StringDecl))))); + expr(anyOf(hasType(StringDecl), hasType(qualType(pointsTo(StringDecl))))); // Match string constructor. const auto StringConstructorExpr = expr(anyOf( - cxxConstructExpr( - argumentCountIs(1), - hasDeclaration(cxxMethodDecl(hasName("basic_string")))), + cxxConstructExpr(argumentCountIs(1), + hasDeclaration(cxxMethodDecl(hasName("basic_string")))), cxxConstructExpr( argumentCountIs(2), hasDeclaration(cxxMethodDecl(hasName("basic_string"))), @@ -103,21 +100,18 @@ void RedundantStringCStrCheck::registerMatchers( .bind("call"); // Detect redundant 'c_str()' calls through a string constructor. - Finder->addMatcher( - cxxConstructExpr(StringConstructorExpr, - hasArgument(0, StringCStrCallExpr)), - this); + Finder->addMatcher(cxxConstructExpr(StringConstructorExpr, + hasArgument(0, StringCStrCallExpr)), + this); // Detect: 's == str.c_str()' -> 's == str' Finder->addMatcher( cxxOperatorCallExpr( - anyOf(hasOverloadedOperatorName("<"), - hasOverloadedOperatorName(">"), - hasOverloadedOperatorName(">="), - hasOverloadedOperatorName("<="), - hasOverloadedOperatorName("!="), - hasOverloadedOperatorName("=="), - hasOverloadedOperatorName("+")), + anyOf( + hasOverloadedOperatorName("<"), hasOverloadedOperatorName(">"), + hasOverloadedOperatorName(">="), hasOverloadedOperatorName("<="), + hasOverloadedOperatorName("!="), hasOverloadedOperatorName("=="), + hasOverloadedOperatorName("+")), anyOf(allOf(hasArgument(0, StringExpr), hasArgument(1, StringCStrCallExpr)), allOf(hasArgument(0, StringCStrCallExpr), @@ -126,47 +120,41 @@ void RedundantStringCStrCheck::registerMatchers( // Detect: 'dst += str.c_str()' -> 'dst += str' // Detect: 's = str.c_str()' -> 's = str' - Finder->addMatcher( - cxxOperatorCallExpr( - anyOf(hasOverloadedOperatorName("="), - hasOverloadedOperatorName("+=")), - hasArgument(0, StringExpr), - hasArgument(1, StringCStrCallExpr)), - this); + Finder->addMatcher(cxxOperatorCallExpr(anyOf(hasOverloadedOperatorName("="), + hasOverloadedOperatorName("+=")), + hasArgument(0, StringExpr), + hasArgument(1, StringCStrCallExpr)), + this); // Detect: 'dst.append(str.c_str())' -> 'dst.append(str)' Finder->addMatcher( - cxxMemberCallExpr(on(StringExpr), - callee(decl(cxxMethodDecl( - hasAnyName("append", "assign", "compare")))), - argumentCountIs(1), - hasArgument(0, StringCStrCallExpr)), + cxxMemberCallExpr(on(StringExpr), callee(decl(cxxMethodDecl(hasAnyName( + "append", "assign", "compare")))), + argumentCountIs(1), hasArgument(0, StringCStrCallExpr)), this); // Detect: 'dst.compare(p, n, str.c_str())' -> 'dst.compare(p, n, str)' Finder->addMatcher( cxxMemberCallExpr(on(StringExpr), - callee(decl(cxxMethodDecl(hasName("compare")))), - argumentCountIs(3), - hasArgument(2, StringCStrCallExpr)), + callee(decl(cxxMethodDecl(hasName("compare")))), + argumentCountIs(3), hasArgument(2, StringCStrCallExpr)), this); // Detect: 'dst.find(str.c_str())' -> 'dst.find(str)' Finder->addMatcher( cxxMemberCallExpr(on(StringExpr), - callee(decl(cxxMethodDecl( - hasAnyName("find", "find_first_not_of", "find_first_of", - "find_last_not_of", "find_last_of", "rfind")))), - anyOf(argumentCountIs(1), argumentCountIs(2)), - hasArgument(0, StringCStrCallExpr)), + callee(decl(cxxMethodDecl(hasAnyName( + "find", "find_first_not_of", "find_first_of", + "find_last_not_of", "find_last_of", "rfind")))), + anyOf(argumentCountIs(1), argumentCountIs(2)), + hasArgument(0, StringCStrCallExpr)), this); // Detect: 'dst.insert(pos, str.c_str())' -> 'dst.insert(pos, str)' Finder->addMatcher( cxxMemberCallExpr(on(StringExpr), - callee(decl(cxxMethodDecl(hasName("insert")))), - argumentCountIs(2), - hasArgument(1, StringCStrCallExpr)), + callee(decl(cxxMethodDecl(hasName("insert")))), + argumentCountIs(2), hasArgument(1, StringCStrCallExpr)), this); // Detect redundant 'c_str()' calls through a StringRef constructor. @@ -176,9 +164,8 @@ void RedundantStringCStrCheck::registerMatchers( // wrt. string types and they internally make a StringRef // referring to the argument. Passing a string directly to // them is preferred to passing a char pointer. - hasDeclaration( - cxxMethodDecl(hasAnyName("::llvm::StringRef::StringRef", - "::llvm::Twine::Twine"))), + hasDeclaration(cxxMethodDecl(hasAnyName( + "::llvm::StringRef::StringRef", "::llvm::Twine::Twine"))), argumentCountIs(1), // The only argument must have the form x.c_str() or p->c_str() // where the method is string::c_str(). StringRef also has diff --git a/clang-tidy/readability/RedundantStringInitCheck.cpp b/clang-tidy/readability/RedundantStringInitCheck.cpp index 7ca8323b..b881e226 100644 --- a/clang-tidy/readability/RedundantStringInitCheck.cpp +++ b/clang-tidy/readability/RedundantStringInitCheck.cpp @@ -33,10 +33,9 @@ void RedundantStringInitCheck::registerMatchers(MatchFinder *Finder) { hasArgument(1, cxxDefaultArgExpr())))); // Match a string constructor expression with an empty string literal. - const auto EmptyStringCtorExpr = - cxxConstructExpr(StringConstructorExpr, - hasArgument(0, ignoringParenImpCasts( - stringLiteral(hasSize(0))))); + const auto EmptyStringCtorExpr = cxxConstructExpr( + StringConstructorExpr, + hasArgument(0, ignoringParenImpCasts(stringLiteral(hasSize(0))))); const auto EmptyStringCtorExprWithTemporaries = cxxConstructExpr(StringConstructorExpr, diff --git a/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h b/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h index eeaec6a1..03e99fd0 100644 --- a/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h +++ b/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h @@ -22,7 +22,8 @@ namespace readability { /// http://clang.llvm.org/extra/clang-tidy/checks/readability-static-definition-in-anonymous-namespace.html class StaticDefinitionInAnonymousNamespaceCheck : public ClangTidyCheck { public: - StaticDefinitionInAnonymousNamespaceCheck(StringRef Name, ClangTidyContext *Context) + StaticDefinitionInAnonymousNamespaceCheck(StringRef Name, + ClangTidyContext *Context) : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; diff --git a/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp b/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp index e159bc97..3ad346cd 100644 --- a/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp +++ b/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp @@ -67,4 +67,3 @@ void UniqueptrDeleteReleaseCheck::check( } // namespace readability } // namespace tidy } // namespace clang - diff --git a/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h b/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h index 43ca22d8..fd86bdb9 100644 --- a/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h +++ b/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h @@ -34,4 +34,3 @@ public: } // namespace clang #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_UNIQUEPTR_DELETE_RELEASE_H - diff --git a/clang-tidy/tool/ClangTidyMain.cpp b/clang-tidy/tool/ClangTidyMain.cpp index ab9d9351..44800377 100644 --- a/clang-tidy/tool/ClangTidyMain.cpp +++ b/clang-tidy/tool/ClangTidyMain.cpp @@ -93,9 +93,7 @@ static cl::opt<bool> SystemHeaders("system-headers", cl::desc("Display the errors from system headers."), cl::init(false), cl::cat(ClangTidyCategory)); -static cl::opt<std::string> - LineFilter("line-filter", - cl::desc(R"( +static cl::opt<std::string> LineFilter("line-filter", cl::desc(R"( List of files with line ranges to filter the warnings. Can be used together with -header-filter. The format of the list is a @@ -105,7 +103,8 @@ JSON array of objects: {"name":"file2.h"} ] )"), - cl::init(""), cl::cat(ClangTidyCategory)); + cl::init(""), + cl::cat(ClangTidyCategory)); static cl::opt<bool> Fix("fix", cl::desc(R"( Apply suggested fixes. Without -fix-errors @@ -220,7 +219,7 @@ static void printProfileData(const ProfileData &Profile, std::vector<std::pair<llvm::TimeRecord, StringRef>> Timers; TimeRecord Total; - for (const auto& P : Profile.Records) { + for (const auto &P : Profile.Records) { Timers.emplace_back(P.getValue(), P.getKey()); Total += P.getValue(); } @@ -324,7 +323,7 @@ static int clangTidyMain(int argc, const char **argv) { std::vector<std::string> EnabledChecks = getCheckNames(EffectiveOptions); if (ExplainConfig) { - //FIXME: Show other ClangTidyOptions' fields, like ExtraArg. + // FIXME: Show other ClangTidyOptions' fields, like ExtraArg. std::vector<clang::tidy::ClangTidyOptionsProvider::OptionsSource> RawOptions = OptionsProvider->getRawOptions(FilePath); for (const std::string &Check : EnabledChecks) { @@ -377,8 +376,7 @@ static int clangTidyMain(int argc, const char **argv) { std::vector<ClangTidyError> Errors; ClangTidyStats Stats = runClangTidy(std::move(OptionsProvider), OptionsParser.getCompilations(), - PathList, &Errors, - EnableCheckProfile ? &Profile : nullptr); + PathList, &Errors, EnableCheckProfile ? &Profile : nullptr); bool FoundErrors = std::find_if(Errors.begin(), Errors.end(), [](const ClangTidyError &E) { return E.DiagLevel == ClangTidyError::Error; @@ -458,7 +456,7 @@ static int LLVM_ATTRIBUTE_UNUSED ModernizeModuleAnchorDestination = // This anchor is used to force the linker to link the MPIModule. extern volatile int MPIModuleAnchorSource; static int LLVM_ATTRIBUTE_UNUSED MPIModuleAnchorDestination = - MPIModuleAnchorSource; + MPIModuleAnchorSource; // This anchor is used to force the linker to link the PerformanceModule. extern volatile int PerformanceModuleAnchorSource; diff --git a/clang-tidy/utils/IncludeInserter.cpp b/clang-tidy/utils/IncludeInserter.cpp index 3a318899..9fc7f521 100644 --- a/clang-tidy/utils/IncludeInserter.cpp +++ b/clang-tidy/utils/IncludeInserter.cpp @@ -21,9 +21,8 @@ public: // Implements PPCallbacks::InclusionDerective(). Records the names and source // locations of the inclusions in the main source file being processed. void InclusionDirective(SourceLocation HashLocation, - const Token & IncludeToken, - StringRef FileNameRef, bool IsAngled, - CharSourceRange FileNameRange, + const Token &IncludeToken, StringRef FileNameRef, + bool IsAngled, CharSourceRange FileNameRange, const FileEntry * /*IncludedFile*/, StringRef /*SearchPath*/, StringRef /*RelativePath*/, const Module * /*ImportedModule*/) override { diff --git a/clang-tidy/utils/Matchers.h b/clang-tidy/utils/Matchers.h index d294ed78..adafdd9a 100644 --- a/clang-tidy/utils/Matchers.h +++ b/clang-tidy/utils/Matchers.h @@ -10,8 +10,8 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_UTILS_MATCHERS_H #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_UTILS_MATCHERS_H -#include "clang/ASTMatchers/ASTMatchers.h" #include "TypeTraits.h" +#include "clang/ASTMatchers/ASTMatchers.h" namespace clang { namespace tidy { @@ -21,9 +21,7 @@ AST_MATCHER(BinaryOperator, isRelationalOperator) { return Node.isRelationalOp(); } -AST_MATCHER(BinaryOperator, isEqualityOperator) { - return Node.isEqualityOp(); -} +AST_MATCHER(BinaryOperator, isEqualityOperator) { return Node.isEqualityOp(); } AST_MATCHER(BinaryOperator, isComparisonOperator) { return Node.isComparisonOp(); diff --git a/clang-tidy/utils/NamespaceAliaser.cpp b/clang-tidy/utils/NamespaceAliaser.cpp index 04fdb8cd..1a5120de 100644 --- a/clang-tidy/utils/NamespaceAliaser.cpp +++ b/clang-tidy/utils/NamespaceAliaser.cpp @@ -35,11 +35,9 @@ NamespaceAliaser::createAlias(ASTContext &Context, const Stmt &Statement, if (!Function || !Function->hasBody()) return None; - if (AddedAliases[Function].count(Namespace.str()) != 0) return None; - // FIXME: Doesn't consider the order of declarations. // If we accidentially pick an alias defined later in the function, // the output won't compile. diff --git a/clang-tidy/utils/TypeTraits.cpp b/clang-tidy/utils/TypeTraits.cpp index 88e4a829..6dd4141b 100644 --- a/clang-tidy/utils/TypeTraits.cpp +++ b/clang-tidy/utils/TypeTraits.cpp @@ -65,7 +65,8 @@ bool recordIsTriviallyDefaultConstructible(const RecordDecl &RecordDecl, if (ClassDecl->hasTrivialDefaultConstructor()) return true; - // If all its fields are trivially constructible and have no default initializers. + // If all its fields are trivially constructible and have no default + // initializers. for (const FieldDecl *Field : ClassDecl->fields()) { if (Field->hasInClassInitializer()) return false; @@ -84,8 +85,7 @@ bool recordIsTriviallyDefaultConstructible(const RecordDecl &RecordDecl, } // Based on QualType::isTrivial. -bool isTriviallyDefaultConstructible(QualType Type, - const ASTContext &Context) { +bool isTriviallyDefaultConstructible(QualType Type, const ASTContext &Context) { if (Type.isNull()) return false; diff --git a/clang-tidy/utils/UsingInserter.cpp b/clang-tidy/utils/UsingInserter.cpp index c0746afc..e7200c99 100644 --- a/clang-tidy/utils/UsingInserter.cpp +++ b/clang-tidy/utils/UsingInserter.cpp @@ -68,7 +68,8 @@ Optional<FixItHint> UsingInserter::createUsingDeclaration( if (HasConflictingDeclaration || HasConflictingDeclRef) return None; - std::string Declaration = (llvm::Twine("\nusing ") + QualifiedName + ";").str(); + std::string Declaration = + (llvm::Twine("\nusing ") + QualifiedName + ";").str(); AddedUsing.emplace(std::make_pair(Function, QualifiedName.str())); return FixItHint::CreateInsertion(InsertLoc, Declaration); diff --git a/tool-template/ToolTemplate.cpp b/tool-template/ToolTemplate.cpp index 54b4a696..f97575e5 100644 --- a/tool-template/ToolTemplate.cpp +++ b/tool-template/ToolTemplate.cpp @@ -34,8 +34,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/ASTMatchers/ASTMatchers.h" #include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/ASTMatchers/ASTMatchers.h" #include "clang/Basic/SourceManager.h" #include "clang/Frontend/FrontendActions.h" #include "clang/Lex/Lexer.h" |