Rename AsyncIteratorProtocol._nextElement -> nextElement

Author: DougGregor

include/swift/AST/KnownIdentifiers.def

@@ -123,7 +123,7 @@ IDENTIFIER(load)
 IDENTIFIER(main)
 IDENTIFIER_WITH_NAME(MainEntryPoint, "$main")
 IDENTIFIER(next)
-IDENTIFIER_(nextElement)
+IDENTIFIER(nextElement)
 IDENTIFIER_(nsErrorDomain)
 IDENTIFIER(objectAtIndexedSubscript)
 IDENTIFIER(objectForKeyedSubscript)

lib/AST/ASTContext.cpp

@@ -957,8 +957,7 @@ FuncDecl *ASTContext::getAsyncIteratorNext() const {
   if (!proto)
     return nullptr;
 
-  if (auto *func = lookupRequirement(
-          proto, getIdentifier("_nextElement"))) {
+  if (auto *func = lookupRequirement(proto, Id_nextElement)) {
     getImpl().AsyncIteratorNext = func;
     return func;
   }

lib/Sema/TypeCheckEffects.cpp

@@ -1335,7 +1335,7 @@ class ApplyClassifier {
             isRethrowLikeTypedThrows(fnRef.getFunction())) {
           // If we are in a rethrowing context and the function we're referring
           // to is a rethrow-like function using typed throws or we are
-          // calling the next() or _nextElement() of an async iterator,
+          // calling the next() or nextElement() of an async iterator,
           // then look at all of the closure arguments.
           LLVM_FALLTHROUGH;
         } else {
@@ -3503,7 +3503,7 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
         CurContext.diagnoseUnhandledThrowStmt(Ctx.Diags, S);
 
       // Note: we don't need to check the thrown error type specifically,
-      // because we will also be checking the _nextElement call.
+      // because we will also be checking the nextElement call.
     }
 
     return ShouldRecurse;

stdlib/public/Concurrency/AsyncIteratorProtocol.swift

@@ -105,15 +105,15 @@ public protocol AsyncIteratorProtocol<Element, Failure> {
   /// - Returns: The next element, if it exists, or `nil` to signal the end of
   ///   the sequence.
   @available(SwiftStdlib 5.11, *)
-  mutating func _nextElement() async throws(Failure) -> Element?
+  mutating func nextElement() async throws(Failure) -> Element?
 }
 
 @available(SwiftStdlib 5.1, *)
 extension AsyncIteratorProtocol {
-  /// Default implementation of `_nextElement()` in terms of `next()`, which is
+  /// Default implementation of `nextElement()` in terms of `next()`, which is
   /// required to maintain backward compatibility with existing async iterators.
   @_alwaysEmitIntoClient
-  public mutating func _nextElement() async throws(Failure) -> Element? {
+  public mutating func nextElement() async throws(Failure) -> Element? {
     do {
       return try await next()
     } catch {

test/IRGen/async/weak_availability.swift

@@ -9,5 +9,5 @@ public func f<S: AsyncSequence>(_ s: S) async throws -> Any.Type {
   return Fn.self
 }
 
-// MAYBE-AVAILABLE: @"$sScI12_nextElement0B0QzSgyYa7FailureQzYKFTjTu" = extern_weak global
+// MAYBE-AVAILABLE: @"$sScI11nextElement0B0QzSgyYa7FailureQzYKFTjTu" = extern_weak global
 // MAYBE-AVAILABLE: declare{{.*}} extern_weak{{.*}} @swift_getFunctionTypeMetadataGlobalActor

test/SILGen/foreach_async.swift

@@ -81,7 +81,7 @@ struct AsyncLazySequence<S: Sequence>: AsyncSequence {
 // CHECK: [[LOOP_DEST]]:
 // CHECK:   [[NEXT_RESULT:%.*]] = alloc_stack $Optional<Int>
 // CHECK:   [[MUTATION:%.*]] = begin_access
-// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE12_nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
+// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE11nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
 // CHECK:   [[ERROR_SLOT:%[0-9]+]] = alloc_stack $Never
 // CHECK:   try_apply [[WITNESS_METHOD]]<AsyncLazySequence<[Int]>.Iterator>([[NEXT_RESULT]], [[ERROR_SLOT]], [[MUTATION]]) : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure), normal [[NORMAL_BB:bb[0-2]+]], error [[ERROR_BB:bb[0-9]+]]
 // CHECK: [[NORMAL_BB]](
@@ -113,7 +113,7 @@ func trivialStruct(_ xx: AsyncLazySequence<[Int]>) async {
 // CHECK: [[LOOP_DEST]]:
 // CHECK:   [[NEXT_RESULT:%.*]] = alloc_stack $Optional<Int>
 // CHECK:   [[MUTATION:%.*]] = begin_access
-// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE12_nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
+// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE11nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
 // CHECK:   [[ERROR_SLOT:%[0-9]+]] = alloc_stack $Never
 // CHECK:   try_apply [[WITNESS_METHOD]]<AsyncLazySequence<[Int]>.Iterator>([[NEXT_RESULT]], [[ERROR_SLOT]], [[MUTATION]]) : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure), normal [[NORMAL_BB:bb[0-2]+]], error [[ERROR_BB:bb[0-9]+]]
 // CHECK:  [[NORMAL_BB]](
@@ -172,7 +172,7 @@ func trivialStructBreak(_ xx: AsyncLazySequence<[Int]>) async {
 // CHECK: [[LOOP_DEST]]:
 // CHECK:   [[NEXT_RESULT:%.*]] = alloc_stack $Optional<Int>
 // CHECK:   [[MUTATION:%.*]] = begin_access
-// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE12_nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
+// CHECK:   [[WITNESS_METHOD:%.*]] = function_ref @$sScIsE11nextElement0B0QzSgyYa7FailureQzYKF : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure)
 // CHECK:   [[ERROR_SLOT:%[0-9]+]] = alloc_stack $Never
 // CHECK:   try_apply [[WITNESS_METHOD]]<AsyncLazySequence<[Int]>.Iterator>([[NEXT_RESULT]], [[ERROR_SLOT]], [[MUTATION]]) : $@convention(method) @async <τ_0_0 where τ_0_0 : AsyncIteratorProtocol> (@inout τ_0_0) -> (@out Optional<τ_0_0.Element>, @error_indirect τ_0_0.Failure), normal [[NORMAL_BB:bb[0-2]+]], error [[ERROR_BB:bb[0-9]+]]
 // CHECK:  [[NORMAL_BB]](

test/api-digester/stability-concurrency-abi.test

@@ -65,7 +65,7 @@ Protocol AsyncSequence has generic signature change from <Self.AsyncIterator : _
 Struct CheckedContinuation has removed conformance to UnsafeSendable
 Protocol AsyncIteratorProtocol is now without @rethrows
 Protocol AsyncSequence is now without @rethrows
-Func AsyncIteratorProtocol._nextElement() has been added as a protocol requirement
+Func AsyncIteratorProtocol.nextElement() has been added as a protocol requirement
 
 // SerialExecutor gained `enqueue(_: __owned Job)`, protocol requirements got default implementations
 Func SerialExecutor.enqueue(_:) has been added as a protocol requirement