Intermediate changes

library/cpp/clang_tidy/arcadia_checks/ascii_compare_ignore_case_check.cpp

@@ -2,7 +2,7 @@
 
 #include <contrib/libs/clang16/include/clang/AST/ASTContext.h>
 #include <contrib/libs/clang16/include/clang/ASTMatchers/ASTMatchFinder.h>
-#include <contrib/libs/clang16/include/clang/Tooling/FixIt.h>
+#include <contrib/libs/clang16/include/clang/Basic/Diagnostic.h>
 
 
 using namespace clang::ast_matchers;
@@ -17,10 +17,10 @@ namespace clang::tidy::arcadia {
 
     void AsciiCompareIgnoreCaseCheck::registerMatchers(MatchFinder* finder) {
         const auto compareMatcher = callExpr(
-            callee(functionDecl(hasName("AsciiCompareIgnoreCase"))),
-            argumentCountIs(2),
-            hasArgument(0, expr()),
-            hasArgument(1, expr())
+            callee(functionDecl(
+                hasName("AsciiCompareIgnoreCase"),
+                parameterCountIs(2)
+            ))
         );
 
         // Case 1: AsciiCompareIgnoreCase(...) is casted (maybe implicitly) to boolean.

library/cpp/clang_tidy/arcadia_checks/usage_restriction_checks.cpp

@@ -7,10 +7,10 @@ using namespace clang::ast_matchers;
 namespace clang::tidy::arcadia {
     void TypeidNameRestrictionCheck::registerMatchers(MatchFinder* Finder) {
         Finder->addMatcher(cxxMemberCallExpr(on(expr(hasType(namedDecl(hasName("::std::type_info")))).bind("expr")),
-                                             callee(cxxMethodDecl(allOf(hasName("name"), parameterCountIs(0))))),
+                                             callee(cxxMethodDecl(hasName("name"), parameterCountIs(0)))),
                            this);
         Finder->addMatcher(cxxMemberCallExpr(on(expr(hasType(namedDecl(hasName("::std::type_index")))).bind("expr")),
-                                             callee(cxxMethodDecl(allOf(hasName("name"), parameterCountIs(0))))),
+                                             callee(cxxMethodDecl(hasName("name"), parameterCountIs(0)))),
                            this);
     }