Author: Congcong Cai Date: 2024-11-19T18:11:41+08:00 New Revision: b3e2b1a7eb258a7c9c55691d08342eface083499
URL: https://github.com/llvm/llvm-project/commit/b3e2b1a7eb258a7c9c55691d08342eface083499 DIFF: https://github.com/llvm/llvm-project/commit/b3e2b1a7eb258a7c9c55691d08342eface083499.diff LOG: [clang-tidy][NFC] fix typo in ExceptionAnalyzer; `replace count()>0` with `contains` (#116635) Added: Modified: clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp index 620a57194acb8e..3d1f63fcf33a5a 100644 --- a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp @@ -20,7 +20,7 @@ namespace { AST_MATCHER_P(FunctionDecl, isEnabled, llvm::StringSet<>, FunctionsThatShouldNotThrow) { - return FunctionsThatShouldNotThrow.count(Node.getNameAsString()) > 0; + return FunctionsThatShouldNotThrow.contains(Node.getNameAsString()); } AST_MATCHER(FunctionDecl, isExplicitThrow) { diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp index 9bfb7e2677533a..68f3ecf6bdaa81 100644 --- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp +++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp @@ -418,7 +418,7 @@ ExceptionAnalyzer::ExceptionInfo::filterIgnoredExceptions( if (TD->getDeclName().isIdentifier()) { if ((IgnoreBadAlloc && (TD->getName() == "bad_alloc" && TD->isInStdNamespace())) || - (IgnoredTypes.count(TD->getName()) > 0)) + (IgnoredTypes.contains(TD->getName()))) TypesToDelete.push_back(T); } } @@ -449,7 +449,8 @@ void ExceptionAnalyzer::ExceptionInfo::reevaluateBehaviour() { ExceptionAnalyzer::ExceptionInfo ExceptionAnalyzer::throwsException( const FunctionDecl *Func, const ExceptionInfo::Throwables &Caught, llvm::SmallSet<const FunctionDecl *, 32> &CallStack) { - if (!Func || CallStack.count(Func) || (!CallStack.empty() && !canThrow(Func))) + if (!Func || CallStack.contains(Func) || + (!CallStack.empty() && !canThrow(Func))) return ExceptionInfo::createNonThrowing(); if (const Stmt *Body = Func->getBody()) { @@ -507,7 +508,7 @@ ExceptionAnalyzer::ExceptionInfo ExceptionAnalyzer::throwsException( for (unsigned I = 0; I < Try->getNumHandlers(); ++I) { const CXXCatchStmt *Catch = Try->getHandler(I); - // Everything is catched through 'catch(...)'. + // Everything is caught through 'catch(...)'. if (!Catch->getExceptionDecl()) { ExceptionInfo Rethrown = throwsException( Catch->getHandlerBlock(), Uncaught.getExceptionTypes(), CallStack); diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h index 0a8cf8668d3ca9..6c2d693d64b50e 100644 --- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h +++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h @@ -101,8 +101,8 @@ class ExceptionAnalyzer { /// Recalculate the 'Behaviour' for example after filtering. void reevaluateBehaviour(); - /// Keep track if the entity related to this 'ExceptionInfo' can in princple - /// throw, if it's unknown or if it won't throw. + /// Keep track if the entity related to this 'ExceptionInfo' can in + /// principle throw, if it's unknown or if it won't throw. State Behaviour; /// Keep track if the entity contains any unknown elements to keep track _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits