A bit of AST matcher cleanup, NFC.

Removed the uses of the allOf() matcher inside node matchers that are implicit
allOf(). Replaced uses of allOf() with the explicit node matcher where it makes
matchers more readable. Replace anyOf(hasName(), hasName(), ...) with the more
efficient and readable hasAnyName().

llvm-svn: 347520

1 files changed, 6 insertions, 6 deletions

diff --git a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
index c8af1abbb81..3c8a6c5d10b 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
@@ -190,12 +190,12 @@ void ExceptionEscapeCheck::registerMatchers(MatchFinder *Finder) {
     return;
 
   Finder->addMatcher(
-      functionDecl(allOf(anyOf(isNoThrow(), cxxDestructorDecl(),
-                               cxxConstructorDecl(isMoveConstructor()),
-                               cxxMethodDecl(isMoveAssignmentOperator()),
-                               hasName("main"), hasName("swap"),
-                               isEnabled(FunctionsThatShouldNotThrow)),
-                         throws(unless(isIgnored(IgnoredExceptions)))))
+      functionDecl(anyOf(isNoThrow(), cxxDestructorDecl(),
+                         cxxConstructorDecl(isMoveConstructor()),
+                         cxxMethodDecl(isMoveAssignmentOperator()),
+                         hasName("main"), hasName("swap"),
+                         isEnabled(FunctionsThatShouldNotThrow)),
+                   throws(unless(isIgnored(IgnoredExceptions))))
           .bind("thrower"),
       this);
 }