diff --git a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp index bd283d0c175b..6d5f94de55da 100644 --- a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp @@ -411,10 +411,10 @@ bool MakeSmartPtrCheck::replaceNew(DiagnosticBuilder &Diag, // stop generating fixes -- as the C++ rule is complicated and we are less // certain about the correct fixes. if (const CXXRecordDecl *RD = New->getType()->getPointeeCXXRecordDecl()) { - if (llvm::find_if(RD->ctors(), [](const CXXConstructorDecl *Ctor) { + if (llvm::any_of(RD->ctors(), [](const CXXConstructorDecl *Ctor) { return Ctor->isCopyOrMoveConstructor() && (Ctor->isDeleted() || Ctor->getAccess() == AS_private); - }) != RD->ctor_end()) { + })) { return false; } } diff --git a/clang-tools-extra/clangd/AST.cpp b/clang-tools-extra/clangd/AST.cpp index 4ddfca328eae..85c32574f9e6 100644 --- a/clang-tools-extra/clangd/AST.cpp +++ b/clang-tools-extra/clangd/AST.cpp @@ -807,9 +807,8 @@ private: // Skip functions with less parameters, they can't be the target. if (Callee->parameters().size() < Parameters.size()) return; - if (std::any_of(Args.begin(), Args.end(), [](const Expr *E) { - return dyn_cast(E) != nullptr; - })) { + if (llvm::any_of(Args, + [](const Expr *E) { return isa(E); })) { return; } auto PackLocation = findPack(Args); diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index f97b140f278a..839c5d18feed 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -515,10 +515,9 @@ bool FormatTokenLexer::tryMergeTokens(size_t Count, TokenType NewType) { bool FormatTokenLexer::tryMergeTokensAny( ArrayRef> Kinds, TokenType NewType) { - return std::any_of(Kinds.begin(), Kinds.end(), - [this, NewType](ArrayRef Kinds) { - return tryMergeTokens(Kinds, NewType); - }); + return llvm::any_of(Kinds, [this, NewType](ArrayRef Kinds) { + return tryMergeTokens(Kinds, NewType); + }); } // Returns \c true if \p Tok can only be followed by an operand in JavaScript.