Merge pull request swiftlang#65617 from zoecarver/update-diag-text

[diags][cxx-interop] Update diagnostic for 'begin' to suggest using a for-loop instead.

Author: zoecarver

include/swift/AST/DiagnosticsClangImporter.def

@@ -196,7 +196,7 @@ NOTE(mark_safe_to_import, none, "annotate method '%0' with 'SWIFT_RETURNS_INDEPE
 NOTE(at_to_subscript, none, "do you want to replace it with a call "
                             "to the subscript operator?",
      ())
-NOTE(get_swift_iterator, none, "do you want to make a Swift iterator instead?",
+NOTE(use_collection_apis, none, "do you want to use a for-loop instead?",
      ())
 NOTE(replace_with_nil, none, "do you want to compare against 'nil' instead?",
      ())

lib/Sema/CSDiagnostics.cpp

@@ -3877,7 +3877,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
       if (conformsToRACollection(baseType)) {
         ctx.Diags.diagnose(loc, diag::iterator_method_unavailable,
                            name.getBaseIdentifier().str());
-        ctx.Diags.diagnose(loc, diag::get_swift_iterator)
+        ctx.Diags.diagnose(loc, diag::use_collection_apis)
             .fixItReplaceChars(
                 loc, loc.getAdvancedLoc(name.getBaseIdentifier().str().size()),
                 "makeIterator");

test/Interop/Cxx/class/fixits-for-std-vector.swift

@@ -22,7 +22,7 @@ import CxxStdlib
 
 public func test(v: V) {
   // CHECK: note: C++ method 'begin' that returns an iterator is unavailable
-  // CHECK: note: do you want to make a Swift iterator instead?
+  // CHECK: note: do you want to use a for-loop instead?
   // CHECK: ^~~~~
   // CHECK: makeIterator
   _ = v.begin()