Replace usages of StringRef.find(Key) != StringRef::npos to StringRef.contains(Key)

mininny · mininny · commit e924cf61048f · 2021-02-04T00:42:04.000+09:00
diff --git a/include/swift/IDE/APIDigesterData.h b/include/swift/IDE/APIDigesterData.h
@@ -162,8 +162,7 @@ struct CommonDiffItem: public APIDiffItem {
 
   bool rightCommentUnderscored() const {
     DeclNameViewer Viewer(RightComment);
-    auto HasUnderScore =
-      [](StringRef S) { return S.find('_') != StringRef::npos; };
+    auto HasUnderScore = [](StringRef S) { return S.contains('_'); };
     auto Args = Viewer.args();
     return HasUnderScore(Viewer.base()) ||
         std::any_of(Args.begin(), Args.end(), HasUnderScore);
diff --git a/lib/ClangImporter/ImportMacro.cpp b/lib/ClangImporter/ImportMacro.cpp
@@ -85,7 +85,7 @@ static ValueDecl *importNumericLiteral(ClangImporter::Implementation &Impl,
         Impl.getClangPreprocessor().getSpelling(tok, SpellingBuffer, &Invalid);
     if (Invalid)
       return nullptr;
-    if (TokSpelling.find('_') != StringRef::npos)
+    if (TokSpelling.contains('_'))
       return nullptr;
   }
 
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -224,7 +224,7 @@ static void validateCompilationConditionArgs(DiagnosticEngine &diags,
                                              const ArgList &args) {
   for (const Arg *A : args.filtered(options::OPT_D)) {
     StringRef name = A->getValue();
-    if (name.find('=') != StringRef::npos) {
+    if (name.contains('=')) {
       diags.diagnose(SourceLoc(),
                      diag::cannot_assign_value_to_conditional_compilation_flag,
                      name);
diff --git a/lib/Frontend/DiagnosticVerifier.cpp b/lib/Frontend/DiagnosticVerifier.cpp
@@ -128,7 +128,7 @@ findDiagnostic(std::vector<CapturedDiagnosticInfo> &CapturedDiagnostics,
 
     // Verify the classification and string.
     if (I->Classification != Expected.Classification ||
-        I->Message.find(Expected.MessageStr) == StringRef::npos)
+        !I->Message.contains(Expected.MessageStr))
       continue;
 
     // Okay, we found a match, hurray!
diff --git a/lib/Frontend/PrintingDiagnosticConsumer.cpp b/lib/Frontend/PrintingDiagnosticConsumer.cpp
@@ -911,7 +911,7 @@ static void annotateSnippetWithInfo(SourceManager &SM,
     for (auto fixIt : Info.FixIts) {
       // Don't print multi-line fix-its inline, only include them at the end of
       // the message.
-      if (fixIt.getText().find("\n") == std::string::npos)
+      if (!fixIt.getText().contains("\n"))
         Snippet.addFixIt(fixIt.getRange(), fixIt.getText());
     }
   }
diff --git a/lib/IDE/SyntaxModel.cpp b/lib/IDE/SyntaxModel.cpp
@@ -1620,8 +1620,7 @@ class DocFieldParser {
 
 public:
   DocFieldParser(StringRef text) : ptr(text.begin()), end(text.end()) {
-    assert(text.rtrim().find('\n') == StringRef::npos &&
-           "expected single line");
+    assert(!text.rtrim().contains('\n') && "expected single line");
   }
 
   // Case-insensitively match one of the following patterns:
diff --git a/lib/IDE/Utils.cpp b/lib/IDE/Utils.cpp
@@ -921,8 +921,8 @@ void ide::collectModuleNames(StringRef SDKPath,
                                std::vector<std::string> &Modules) {
   std::string SDKName = getSDKName(SDKPath);
   std::string lowerSDKName = StringRef(SDKName).lower();
-  bool isOSXSDK = StringRef(lowerSDKName).find("macosx") != StringRef::npos;
-  bool isDeviceOnly = StringRef(lowerSDKName).find("iphoneos") != StringRef::npos;
+  bool isOSXSDK = StringRef(lowerSDKName).contains("macosx");
+  bool isDeviceOnly = StringRef(lowerSDKName).contains("iphoneos");
   auto Mods = isOSXSDK ? getOSXModuleList() : getiOSModuleList();
   Modules.insert(Modules.end(), Mods.begin(), Mods.end());
   if (isDeviceOnly) {
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
@@ -1163,7 +1163,7 @@ llvm::SmallString<32> getTargetDependentLibraryOption(const llvm::Triple &T,
   llvm::SmallString<32> buffer;
 
   if (T.isWindowsMSVCEnvironment() || T.isWindowsItaniumEnvironment()) {
-    bool quote = library.find(' ') != StringRef::npos;
+    bool quote = library.contains(' ');
 
     buffer += "/DEFAULTLIB:";
     if (quote)
@@ -1174,7 +1174,7 @@ llvm::SmallString<32> getTargetDependentLibraryOption(const llvm::Triple &T,
     if (quote)
       buffer += '"';
   } else if (T.isPS4()) {
-    bool quote = library.find(' ') != StringRef::npos;
+    bool quote = library.contains(' ');
 
     buffer += "\01";
     if (quote)
diff --git a/lib/LLVMPasses/ARCEntryPointBuilder.h b/lib/LLVMPasses/ARCEntryPointBuilder.h
@@ -193,8 +193,7 @@ class ARCEntryPointBuilder {
     // intrinsics are atomic today.
     if (I->getIntrinsicID() != llvm::Intrinsic::not_intrinsic)
       return false;
-    return (I->getCalledFunction()->getName().find("nonatomic") !=
-            llvm::StringRef::npos);
+    return (I->getCalledFunction()->getName().contains("nonatomic"));
   }
 
   bool isAtomic(CallInst *I) {
diff --git a/lib/SILOptimizer/IPO/GlobalOpt.cpp b/lib/SILOptimizer/IPO/GlobalOpt.cpp
@@ -236,7 +236,7 @@ static void removeToken(SILValue Op) {
     if (!(GAI->use_empty() || GAI->hasOneUse()))
       return;
     // If it is not a *_token global variable, bail.
-    if (!Global || Global->getName().find("_token") == StringRef::npos)
+    if (!Global || !Global->getName().contains("_token"))
       return;
     GAI->getModule().eraseGlobalVariable(Global);
     GAI->replaceAllUsesWithUndef();
diff --git a/lib/SILOptimizer/PassManager/PassManager.cpp b/lib/SILOptimizer/PassManager/PassManager.cpp
@@ -163,12 +163,11 @@ static bool doPrintBefore(SILTransform *T, SILFunction *F) {
     return false;
 
   if (!SILPrintOnlyFuns.empty() && F &&
-      F->getName().find(SILPrintOnlyFuns, 0) == StringRef::npos)
+      !F->getName().contains(SILPrintOnlyFuns))
     return false;
 
   auto MatchFun = [&](const std::string &Str) -> bool {
-    return T->getTag().find(Str) != StringRef::npos
-      || T->getID().find(Str) != StringRef::npos;
+    return T->getTag().contains(Str) || T->getID().contains(Str);
   };
 
   if (SILPrintBefore.end() !=
@@ -188,12 +187,11 @@ static bool doPrintAfter(SILTransform *T, SILFunction *F, bool Default) {
     return false;
 
   if (!SILPrintOnlyFuns.empty() && F &&
-      F->getName().find(SILPrintOnlyFuns, 0) == StringRef::npos)
+      !F->getName().contains(SILPrintOnlyFuns))
     return false;
 
   auto MatchFun = [&](const std::string &Str) -> bool {
-    return T->getTag().find(Str) != StringRef::npos
-      || T->getID().find(Str) != StringRef::npos;
+    return T->getTag().contains(Str) || T->getID().contains(Str);
   };
 
   if (SILPrintAfter.end() !=
@@ -215,8 +213,7 @@ static bool isDisabled(SILTransform *T, SILFunction *F = nullptr) {
     return false;
 
   for (const std::string &NamePattern : SILDisablePass) {
-    if (T->getTag().find(NamePattern) != StringRef::npos
-        || T->getID().find(NamePattern) != StringRef::npos) {
+    if (T->getTag().contains(NamePattern) || T->getID().contains(NamePattern)) {
       return true;
     }
   }
@@ -233,8 +230,7 @@ static void printModule(SILModule *Mod, bool EmitVerboseSIL) {
         std::find(SILPrintOnlyFun.begin(), SILPrintOnlyFun.end(), F.getName()))
       F.dump(EmitVerboseSIL);
 
-    if (!SILPrintOnlyFuns.empty() &&
-        F.getName().find(SILPrintOnlyFuns, 0) != StringRef::npos)
+    if (!SILPrintOnlyFuns.empty() && F.getName().contains(SILPrintOnlyFuns))
       F.dump(EmitVerboseSIL);
   }
 }
@@ -429,8 +425,7 @@ void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {
   CurrentPassHasInvalidated = false;
 
   auto MatchFun = [&](const std::string &Str) -> bool {
-    return SFT->getTag().find(Str) != StringRef::npos ||
-           SFT->getID().find(Str) != StringRef::npos;
+    return SFT->getTag().contains(Str) || SFT->getID().contains(Str);
   };
   if ((SILVerifyBeforePass.end() != std::find_if(SILVerifyBeforePass.begin(),
                                                  SILVerifyBeforePass.end(),
@@ -597,8 +592,7 @@ void SILPassManager::runModulePass(unsigned TransIdx) {
   }
 
   auto MatchFun = [&](const std::string &Str) -> bool {
-    return SMT->getTag().find(Str) != StringRef::npos ||
-           SMT->getID().find(Str) != StringRef::npos;
+    return SMT->getTag().contains(Str) || SMT->getID().contains(Str);
   };
   if ((SILVerifyBeforePass.end() != std::find_if(SILVerifyBeforePass.begin(),
                                                  SILVerifyBeforePass.end(),
diff --git a/lib/SILOptimizer/Transforms/Outliner.cpp b/lib/SILOptimizer/Transforms/Outliner.cpp
@@ -1290,7 +1290,7 @@ class Outliner : public SILFunctionTransform {
 
     // Dump function if requested.
     if (DumpFuncsBeforeOutliner.size() &&
-        Fun->getName().find(DumpFuncsBeforeOutliner, 0) != StringRef::npos) {
+        Fun->getName().contains(DumpFuncsBeforeOutliner)) {
       Fun->dump();
     }
 
diff --git a/lib/SILOptimizer/UtilityPasses/CFGPrinter.cpp b/lib/SILOptimizer/UtilityPasses/CFGPrinter.cpp
@@ -53,7 +53,7 @@ class SILCFGPrinter : public SILFunctionTransform {
     if (!SILViewCFGOnlyFun.empty() && F && F->getName() != SILViewCFGOnlyFun)
       return;
     if (!SILViewCFGOnlyFuns.empty() && F &&
-        F->getName().find(SILViewCFGOnlyFuns, 0) == StringRef::npos)
+        !F->getName().contains(SILViewCFGOnlyFuns))
       return;
 
     F->viewCFG();
diff --git a/lib/SILOptimizer/UtilityPasses/LoopRegionPrinter.cpp b/lib/SILOptimizer/UtilityPasses/LoopRegionPrinter.cpp
@@ -50,7 +50,7 @@ class LoopRegionViewText : public SILModuleTransform {
       if (!SILViewCFGOnlyFun.empty() && fn.getName() != SILViewCFGOnlyFun)
         continue;
       if (!SILViewCFGOnlyFuns.empty() &&
-          fn.getName().find(SILViewCFGOnlyFuns, 0) == StringRef::npos)
+          !fn.getName().contains(SILViewCFGOnlyFuns))
         continue;
 
       // Ok, we are going to analyze this function. Invalidate all state
@@ -74,7 +74,7 @@ class LoopRegionViewCFG : public SILModuleTransform {
       if (!SILViewCFGOnlyFun.empty() && fn.getName() != SILViewCFGOnlyFun)
         continue;
       if (!SILViewCFGOnlyFuns.empty() &&
-          fn.getName().find(SILViewCFGOnlyFuns, 0) == StringRef::npos)
+          !fn.getName().contains(SILViewCFGOnlyFuns))
         continue;
 
       // Ok, we are going to analyze this function. Invalidate all state
diff --git a/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp b/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
@@ -790,8 +790,8 @@ SILFunction *swift::getEligibleFunction(FullApplySite AI,
     return nullptr;
   }
 
-  if (!SILInlineNeverFuns.empty()
-      && Callee->getName().find(SILInlineNeverFuns, 0) != StringRef::npos)
+  if (!SILInlineNeverFuns.empty() &&
+      Callee->getName().contains(SILInlineNeverFuns))
     return nullptr;
 
   if (!SILInlineNeverFun.empty() &&
diff --git a/tools/SourceKit/lib/Support/UIDRegistry.cpp b/tools/SourceKit/lib/Support/UIDRegistry.cpp
@@ -85,7 +85,7 @@ void UIdent::print(llvm::raw_ostream &OS) const {
 
 void *UIDRegistryImpl::get(StringRef Str) {
   assert(!Str.empty());
-  assert(Str.find(' ') == StringRef::npos);
+  assert(!Str.contains(' '));
   EntryTy *Ptr = 0;
   Queue.dispatchSync([&]{
     HashTableTy::iterator It = HashTable.find(Str);
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp
@@ -721,7 +721,7 @@ sourcekitd_object_t YAMLRequestParser::createObjFromNode(
     if (!Raw.getAsInteger(10, val))
       return sourcekitd_request_int64_create(val);
 
-    if (Raw.find(' ') != StringRef::npos)
+    if (Raw.contains(' '))
       return withError("Found space in non-string value", Value, Error);
 
     return sourcekitd_request_uid_create(
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
@@ -104,8 +104,8 @@ static bool shouldRunAsSubcommand(StringRef ExecName,
   // Otherwise, we have a program argument. If it looks like an option or a
   // path, then invoke in interactive mode with the arguments as given.
   StringRef FirstArg(Args[1]);
-  if (FirstArg.startswith("-") || FirstArg.find('.') != StringRef::npos ||
-      FirstArg.find('/') != StringRef::npos)
+  if (FirstArg.startswith("-") || FirstArg.contains('.') ||
+      FirstArg.contains('/'))
     return false;
 
   // Otherwise, we should have some sort of subcommand. Get the subcommand name
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
@@ -2291,8 +2291,7 @@ int swift::ide::api::findDeclUsr(StringRef dumpPath, CheckerOptions Opts) {
     FinderByLocation(StringRef Location): Location(Location) {}
     void visit(SDKNode* Node) override {
       if (auto *D = dyn_cast<SDKNodeDecl>(Node)) {
-        if (D->getLocation().find(Location) != StringRef::npos &&
-            !D->getUsr().empty()) {
+        if (D->getLocation().contains(Location) && !D->getUsr().empty()) {
           llvm::outs() << D->getFullyQualifiedName() << ": " << D->getUsr() << "\n";
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ static ValueDecl *importNumericLiteral(ClangImporter::Implementation &Impl,`
`85`	`85`	`Impl.getClangPreprocessor().getSpelling(tok, SpellingBuffer, &Invalid);`
`86`	`86`	`if (Invalid)`
`87`	`87`	`return nullptr;`
`88`		`- if (TokSpelling.find('_') != StringRef::npos)`
	`88`	`+ if (TokSpelling.contains('_'))`
`89`	`89`	`return nullptr;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ static void annotateSnippetWithInfo(SourceManager &SM,`
`911`	`911`	`for (auto fixIt : Info.FixIts) {`
`912`	`912`	`// Don't print multi-line fix-its inline, only include them at the end of`
`913`	`913`	`// the message.`
`914`		`- if (fixIt.getText().find("\n") == std::string::npos)`
	`914`	`+ if (!fixIt.getText().contains("\n"))`
`915`	`915`	`Snippet.addFixIt(fixIt.getRange(), fixIt.getText());`
`916`	`916`	`}`
`917`	`917`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1620,8 +1620,7 @@ class DocFieldParser {`
`1620`	`1620`
`1621`	`1621`	`public:`
`1622`	`1622`	`DocFieldParser(StringRef text) : ptr(text.begin()), end(text.end()) {`
`1623`		`- assert(text.rtrim().find('\n') == StringRef::npos &&`
`1624`		`- "expected single line");`
	`1623`	`+ assert(!text.rtrim().contains('\n') && "expected single line");`
`1625`	`1624`	`}`
`1626`	`1625`
`1627`	`1626`	`// Case-insensitively match one of the following patterns:`
Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ class ARCEntryPointBuilder {`
`193`	`193`	`// intrinsics are atomic today.`
`194`	`194`	`if (I->getIntrinsicID() != llvm::Intrinsic::not_intrinsic)`
`195`	`195`	`return false;`
`196`		`- return (I->getCalledFunction()->getName().find("nonatomic") !=`
`197`		`- llvm::StringRef::npos);`
	`196`	`+ return (I->getCalledFunction()->getName().contains("nonatomic"));`
`198`	`197`	`}`
`199`	`198`
`200`	`199`	`bool isAtomic(CallInst *I) {`