[clang-tools-extra] 15aa965 - [clang-tools-extra] Use *{Set,Map}::contains (NFC)
Kazu Hirata via cfe-commits
cfe-commits at lists.llvm.org
Tue Mar 14 21:30:47 PDT 2023
Author: Kazu Hirata
Date: 2023-03-14T21:30:29-07:00
New Revision: 15aa965363df5cf3a021b3841bcafbced3756ea2
URL: https://github.com/llvm/llvm-project/commit/15aa965363df5cf3a021b3841bcafbced3756ea2
DIFF: https://github.com/llvm/llvm-project/commit/15aa965363df5cf3a021b3841bcafbced3756ea2.diff
LOG: [clang-tools-extra] Use *{Set,Map}::contains (NFC)
Added:
Modified:
clang-tools-extra/clang-doc/HTMLGenerator.cpp
clang-tools-extra/clang-doc/MDGenerator.cpp
clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.cpp
clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
clang-tools-extra/clangd/FileDistance.cpp
clang-tools-extra/clangd/Headers.cpp
clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
clang-tools-extra/include-cleaner/include/clang-include-cleaner/Record.h
clang-tools-extra/include-cleaner/lib/Record.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-doc/HTMLGenerator.cpp b/clang-tools-extra/clang-doc/HTMLGenerator.cpp
index b61780ca4d971..d2466857e5110 100644
--- a/clang-tools-extra/clang-doc/HTMLGenerator.cpp
+++ b/clang-tools-extra/clang-doc/HTMLGenerator.cpp
@@ -866,7 +866,7 @@ HTMLGenerator::generateDocs(StringRef RootDir,
llvm::SmallString<128> Path;
llvm::sys::path::native(RootDir, Path);
llvm::sys::path::append(Path, Info->getRelativeFilePath(""));
- if (CreatedDirs.find(Path) == CreatedDirs.end()) {
+ if (!CreatedDirs.contains(Path)) {
if (std::error_code Err = llvm::sys::fs::create_directories(Path);
Err != std::error_code()) {
return llvm::createStringError(Err, "Failed to create directory '%s'.",
diff --git a/clang-tools-extra/clang-doc/MDGenerator.cpp b/clang-tools-extra/clang-doc/MDGenerator.cpp
index 8261e14c3efb0..2f56fd99b7bdc 100644
--- a/clang-tools-extra/clang-doc/MDGenerator.cpp
+++ b/clang-tools-extra/clang-doc/MDGenerator.cpp
@@ -387,7 +387,7 @@ MDGenerator::generateDocs(StringRef RootDir,
llvm::SmallString<128> Path;
llvm::sys::path::native(RootDir, Path);
llvm::sys::path::append(Path, Info->getRelativeFilePath(""));
- if (CreatedDirs.find(Path) == CreatedDirs.end()) {
+ if (!CreatedDirs.contains(Path)) {
if (std::error_code Err = llvm::sys::fs::create_directories(Path);
Err != std::error_code()) {
return llvm::createStringError(Err, "Failed to create directory '%s'.",
diff --git a/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
index ae874210afc1a..f578f7ea71c08 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.cpp
@@ -147,7 +147,7 @@ void ForwardDeclarationNamespaceCheck::onEndOfTranslationUnit() {
}
// Check if a definition in another namespace exists.
const auto DeclName = CurDecl->getName();
- if (DeclNameToDefinitions.find(DeclName) == DeclNameToDefinitions.end()) {
+ if (!DeclNameToDefinitions.contains(DeclName)) {
continue; // No definition in this translation unit, we can skip it.
}
// Make a warning for each definition with the same name (in other
diff --git a/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp b/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
index 8ffcf476457db..c5bd6055072aa 100644
--- a/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.cpp
@@ -24,7 +24,7 @@ constexpr llvm::StringLiteral KDisabledTestPrefix = "DISABLED_";
static bool isGoogletestTestMacro(StringRef MacroName) {
static const llvm::StringSet<> MacroNames = {"TEST", "TEST_F", "TEST_P",
"TYPED_TEST", "TYPED_TEST_P"};
- return MacroNames.find(MacroName) != MacroNames.end();
+ return MacroNames.contains(MacroName);
}
namespace {
diff --git a/clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.cpp b/clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.cpp
index 903fd42d12ab1..5abe4f77d6598 100644
--- a/clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.cpp
+++ b/clang-tools-extra/clang-tidy/mpi/TypeMismatchCheck.cpp
@@ -75,7 +75,7 @@ static bool isStandardMPIDatatype(StringRef MPIDatatype) {
"MPI_CXX_DOUBLE_COMPLEX",
"MPI_CXX_LONG_DOUBLE_COMPLEX"};
- return AllTypes.find(MPIDatatype) != AllTypes.end();
+ return AllTypes.contains(MPIDatatype);
}
/// Check if a BuiltinType matches the MPI datatype.
diff --git a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
index 7fe0c0982dc30..14bf22a4d4200 100644
--- a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
@@ -137,11 +137,11 @@ static bool applyEqualityHeuristic(StringRef Arg, StringRef Param) {
static bool applyAbbreviationHeuristic(
const llvm::StringMap<std::string> &AbbreviationDictionary, StringRef Arg,
StringRef Param) {
- if (AbbreviationDictionary.find(Arg) != AbbreviationDictionary.end() &&
+ if (AbbreviationDictionary.contains(Arg) &&
Param.equals(AbbreviationDictionary.lookup(Arg)))
return true;
- if (AbbreviationDictionary.find(Param) != AbbreviationDictionary.end() &&
+ if (AbbreviationDictionary.contains(Param) &&
Arg.equals(AbbreviationDictionary.lookup(Param)))
return true;
diff --git a/clang-tools-extra/clangd/FileDistance.cpp b/clang-tools-extra/clangd/FileDistance.cpp
index cf10d158f08ca..a5fb3d2bcc35b 100644
--- a/clang-tools-extra/clangd/FileDistance.cpp
+++ b/clang-tools-extra/clangd/FileDistance.cpp
@@ -78,7 +78,7 @@ FileDistance::FileDistance(llvm::StringMap<SourceParams> Sources,
Down.push_back(Hash);
// We can't just break after MaxUpTraversals, must still set DownEdges.
if (I > S.getValue().MaxUpTraversals) {
- if (Cache.find(Hash) != Cache.end())
+ if (Cache.contains(Hash))
break;
} else {
unsigned Cost = S.getValue().Cost + I * Opts.UpCost;
diff --git a/clang-tools-extra/clangd/Headers.cpp b/clang-tools-extra/clangd/Headers.cpp
index 8a71f0ece17c8..344afdba9622a 100644
--- a/clang-tools-extra/clangd/Headers.cpp
+++ b/clang-tools-extra/clangd/Headers.cpp
@@ -262,7 +262,7 @@ bool IncludeInserter::shouldInsertInclude(
if (FileName == DeclaringHeader || FileName == InsertedHeader.File)
return false;
auto Included = [&](llvm::StringRef Header) {
- return IncludedHeaders.find(Header) != IncludedHeaders.end();
+ return IncludedHeaders.contains(Header);
};
return !Included(DeclaringHeader) && !Included(InsertedHeader.File);
}
diff --git a/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
index b32875fe19500..e5c9fc5408806 100644
--- a/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
+++ b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
@@ -69,7 +69,7 @@ class MemoryShardStorage : public BackgroundIndexStorage {
loadShard(llvm::StringRef ShardIdentifier) const override {
std::lock_guard<std::mutex> Lock(StorageMu);
AccessedPaths.insert(ShardIdentifier);
- if (Storage.find(ShardIdentifier) == Storage.end()) {
+ if (!Storage.contains(ShardIdentifier)) {
return nullptr;
}
auto IndexFile =
diff --git a/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Record.h b/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Record.h
index 140713bf12807..27a2270f7e362 100644
--- a/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Record.h
+++ b/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Record.h
@@ -55,7 +55,7 @@ class PragmaIncludes {
/// Returns true if the given #include of the main-file should never be
/// removed.
bool shouldKeep(unsigned HashLineNumber) const {
- return ShouldKeep.find(HashLineNumber) != ShouldKeep.end();
+ return ShouldKeep.contains(HashLineNumber);
}
/// Returns the public mapping include for the given physical header file.
diff --git a/clang-tools-extra/include-cleaner/lib/Record.cpp b/clang-tools-extra/include-cleaner/lib/Record.cpp
index 51fd39300d7c7..ff29fda8663b9 100644
--- a/clang-tools-extra/include-cleaner/lib/Record.cpp
+++ b/clang-tools-extra/include-cleaner/lib/Record.cpp
@@ -382,7 +382,7 @@ bool PragmaIncludes::isSelfContained(const FileEntry *FE) const {
}
bool PragmaIncludes::isPrivate(const FileEntry *FE) const {
- return IWYUPublic.find(FE->getUniqueID()) != IWYUPublic.end();
+ return IWYUPublic.contains(FE->getUniqueID());
}
namespace {
More information about the cfe-commits
mailing list