Replace usages of .find(Key) != .end() to .contains(Key) in llvm sets

Author: mininny

lib/AST/NameLookup.cpp

@@ -1059,7 +1059,7 @@ class swift::MemberLookupTable {
   /// Returns \c true if the lookup table has a complete accounting of the
   /// given name.
   bool isLazilyComplete(DeclBaseName name) const {
-    return LazilyCompleteNames.find(name) != LazilyCompleteNames.end();
+    return LazilyCompleteNames.contains(name);
   }
 
   /// Mark a given lazily-loaded name as being complete.

lib/Driver/Driver.cpp

@@ -660,7 +660,7 @@ static SmallVector<StringRef, 8> findRemovedInputs(
   SmallVector<StringRef, 8> missingInputs;
   for (auto &previousInput : previousInputs) {
     auto previousInputArg = previousInput.getKey();
-    if (inputArgs.find(previousInputArg) == inputArgs.end()) {
+    if (!inputArgs.contains(previousInputArg)) {
       missingInputs.push_back(previousInputArg);
     }
   }

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.contains(Expected.MessageStr))
+        I->Message.find(Expected.MessageStr) == StringRef::npos)
       continue;
 
     // Okay, we found a match, hurray!

lib/FrontendTool/TBD.cpp

@@ -93,7 +93,7 @@ static bool validateSymbols(DiagnosticEngine &diags,
           irNotTBD.push_back(unmangledName);
       }
     } else {
-      assert(symbolSet.find(name) == symbolSet.end() &&
+      assert(!symbolSet.contains(name) &&
              "non-global value in value symbol table");
     }
   }

lib/IDE/ModuleInterfacePrinting.cpp

@@ -424,7 +424,7 @@ getDeclsFromCrossImportOverlay(ModuleDecl *Overlay, ModuleDecl *Declaring,
         return false;
 
       // Ignore an imports of modules also imported by the underlying module.
-      if (PrevImported.find(Imported) != PrevImported.end())
+      if (PrevImported.contains(Imported))
         return false;
     }
     if (auto *VD = dyn_cast<ValueDecl>(D)) {

lib/LLVMPasses/LLVMARCOpts.cpp

@@ -142,8 +142,8 @@ static bool canonicalizeInputFunction(Function &F, ARCEntryPointBuilder &B,
         // Have not encountered a strong retain/release. keep it in the
         // unknown retain/release list for now. It might get replaced
         // later.
-        if (NativeRefs.find(ArgVal) == NativeRefs.end()) {
-           UnknownObjectRetains[ArgVal].push_back(&CI);
+        if (!NativeRefs.contains(ArgVal)) {
+          UnknownObjectRetains[ArgVal].push_back(&CI);
         } else {
           B.setInsertPoint(&CI);
           B.createRetain(ArgVal, &CI);
@@ -189,7 +189,7 @@ static bool canonicalizeInputFunction(Function &F, ARCEntryPointBuilder &B,
         // Have not encountered a strong retain/release. keep it in the
         // unknown retain/release list for now. It might get replaced
         // later.
-        if (NativeRefs.find(ArgVal) == NativeRefs.end()) {
+        if (!NativeRefs.contains(ArgVal)) {
           UnknownObjectReleases[ArgVal].push_back(&CI);
         } else {
           B.setInsertPoint(&CI);

lib/Migrator/APIDiffMigratorPass.cpp

@@ -1358,8 +1358,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     llvm::raw_svector_ostream OS(Buffer);
     if (swift::ide::printValueDeclUSR(OD, OS))
       return SourceLoc();
-    return OverridingRemoveNames.find(OS.str()) == OverridingRemoveNames.end() ?
-      SourceLoc() : OverrideLoc;
+    return OverridingRemoveNames.contains(OS.str()) ? OverrideLoc : SourceLoc();
   }
 
   struct SuperRemoval: public ASTWalker {
@@ -1380,7 +1379,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
           auto *RD = DSC->getFn()->getReferencedDecl().getDecl();
           if (swift::ide::printValueDeclUSR(RD, OS))
             return false;
-          return USRs.find(OS.str()) != USRs.end();
+          return USRs.contains(OS.str());
         }
       }
       // We should handle try super.foo() too.

lib/PrintAsObjC/DeclAndTypePrinter.cpp

@@ -71,7 +71,7 @@ static bool isClangKeyword(Identifier name) {
 
   if (name.empty())
     return false;
-  return keywords.find(name.str()) != keywords.end();
+  return keywords.contains(name.str());
 }
 
 

lib/SILOptimizer/Analysis/ARCAnalysis.cpp

@@ -697,7 +697,7 @@ findMatchingRetains(SILBasicBlock *BB) {
         SA = nullptr;
 
       for (auto X : R.first->getPredecessorBlocks()) {
-        if (HandledBBs.find(X) != HandledBBs.end())
+        if (HandledBBs.contains(X))
           continue;
         // Try to use the predecessor edge-value.
         if (SA && SA->getIncomingPhiValue(X)) {

lib/SILOptimizer/Analysis/EpilogueARCAnalysis.cpp

@@ -40,8 +40,8 @@ void EpilogueARCContext::initializeDataflow() {
     SILValue CArg = ToProcess.pop_back_val();
     if (!CArg)
       continue;
-    if (Processed.find(CArg) != Processed.end())
-       continue;
+    if (Processed.contains(CArg))
+      continue;
     Processed.insert(CArg);
     if (auto *A = dyn_cast<SILPhiArgument>(CArg)) {
       // Find predecessor and break the SILArgument to predecessors.

tools/swift-api-digester/swift-api-digester.cpp

@@ -2508,11 +2508,13 @@ static int generateMigrationScript(StringRef LeftPath, StringRef RightPath,
   TypeAliasDiffFinder(RightModule, LeftModule, RevertAliasMap).search();
   populateAliasChanges(RevertAliasMap, AllItems, /*IsRevert*/true);
 
-  AllItems.erase(std::remove_if(AllItems.begin(), AllItems.end(),
-                                [&](CommonDiffItem &Item) {
-    return Item.DiffKind == NodeAnnotation::RemovedDecl &&
-      IgnoredRemoveUsrs.find(Item.LeftUsr) != IgnoredRemoveUsrs.end();
-  }), AllItems.end());
+  AllItems.erase(
+      std::remove_if(AllItems.begin(), AllItems.end(),
+                     [&](CommonDiffItem &Item) {
+                       return Item.DiffKind == NodeAnnotation::RemovedDecl &&
+                              IgnoredRemoveUsrs.contains(Item.LeftUsr);
+                     }),
+      AllItems.end());
 
   NoEscapeFuncParamVector AllNoEscapingFuncs;
   NoEscapingFuncEmitter::collectDiffItems(RightModule, AllNoEscapingFuncs);