Skip to content

Commit 4ba9d9c

Browse files
Use StringRef::contains (NFC)
1 parent a709787 commit 4ba9d9c

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed

clang-tools-extra/modularize/CoverageChecker.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,7 @@ bool CoverageChecker::collectFileSystemHeaders(StringRef IncludePath) {
381381
continue;
382382
// Assume directories or files starting with '.' are private and not to
383383
// be considered.
384-
if ((file.find("\\.") != StringRef::npos) ||
385-
(file.find("/.") != StringRef::npos))
384+
if (file.contains("\\.") || file.contains("/."))
386385
continue;
387386
// If the file does not have a common header extension, ignore it.
388387
if (!ModularizeUtilities::isHeader(file))

lld/COFF/PDB.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,8 +1347,8 @@ static std::string quote(ArrayRef<StringRef> args) {
13471347
for (StringRef a : args) {
13481348
if (!r.empty())
13491349
r.push_back(' ');
1350-
bool hasWS = a.find(' ') != StringRef::npos;
1351-
bool hasQ = a.find('"') != StringRef::npos;
1350+
bool hasWS = a.contains(' ');
1351+
bool hasQ = a.contains('"');
13521352
if (hasWS || hasQ)
13531353
r.push_back('"');
13541354
if (hasQ) {

lldb/source/Commands/CommandObjectWatchpoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static int32_t WithRSAIndex(llvm::StringRef Arg) {
5656

5757
uint32_t i;
5858
for (i = 0; i < 4; ++i)
59-
if (Arg.find(RSA[i]) != llvm::StringRef::npos)
59+
if (Arg.contains(RSA[i]))
6060
return i;
6161
return -1;
6262
}

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ static bool FindFunctionInModule(ConstString &mangled_name,
13091309
llvm::Module *module, const char *orig_name) {
13101310
for (const auto &func : module->getFunctionList()) {
13111311
const StringRef &name = func.getName();
1312-
if (name.find(orig_name) != StringRef::npos) {
1312+
if (name.contains(orig_name)) {
13131313
mangled_name.SetString(name);
13141314
return true;
13151315
}

lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ MSVCUndecoratedNameParser::MSVCUndecoratedNameParser(llvm::StringRef name) {
7272
}
7373

7474
bool MSVCUndecoratedNameParser::IsMSVCUndecoratedName(llvm::StringRef name) {
75-
return name.find('`') != llvm::StringRef::npos;
75+
return name.contains('`');
7676
}
7777

7878
bool MSVCUndecoratedNameParser::ExtractContextAndIdentifier(

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,17 +1543,17 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo(
15431543
region_info.GetRange().IsValid()) {
15441544
saw_permissions = true;
15451545
if (region_info.GetRange().Contains(addr)) {
1546-
if (value.find('r') != llvm::StringRef::npos)
1546+
if (value.contains('r'))
15471547
region_info.SetReadable(MemoryRegionInfo::eYes);
15481548
else
15491549
region_info.SetReadable(MemoryRegionInfo::eNo);
15501550

1551-
if (value.find('w') != llvm::StringRef::npos)
1551+
if (value.contains('w'))
15521552
region_info.SetWritable(MemoryRegionInfo::eYes);
15531553
else
15541554
region_info.SetWritable(MemoryRegionInfo::eNo);
15551555

1556-
if (value.find('x') != llvm::StringRef::npos)
1556+
if (value.contains('x'))
15571557
region_info.SetExecutable(MemoryRegionInfo::eYes);
15581558
else
15591559
region_info.SetExecutable(MemoryRegionInfo::eNo);

lldb/tools/lldb-vscode/lldb-vscode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2747,7 +2747,7 @@ void request_setVariable(const llvm::json::Object &request) {
27472747
const auto variablesReference =
27482748
GetUnsigned(arguments, "variablesReference", 0);
27492749
llvm::StringRef name = GetString(arguments, "name");
2750-
bool is_duplicated_variable_name = name.find(" @") != llvm::StringRef::npos;
2750+
bool is_duplicated_variable_name = name.contains(" @");
27512751

27522752
const auto value = GetString(arguments, "value");
27532753
// Set success to false just in case we don't find the variable by name

mlir/lib/IR/MLIRContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ Identifier Identifier::get(const Twine &string, MLIRContext *context) {
853853
// identifier table - if we already had it in the table, then it already
854854
// passed invariant checks.
855855
assert(!str.empty() && "Cannot create an empty identifier");
856-
assert(str.find('\0') == StringRef::npos &&
856+
assert(!str.contains('\0') &&
857857
"Cannot create an identifier with a nul character");
858858

859859
auto getDialectOrContext = [&]() {

0 commit comments

Comments
 (0)