[Concurrency] Alternative Task API

stdlib/public/Concurrency/CMakeLists.txt

@@ -58,6 +58,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   AsyncThrowingMapSequence.swift
   AsyncThrowingPrefixWhileSequence.swift
   PartialAsyncTask.swift
+  SourceCompatibilityShims.swift
   Task.cpp
   Task.swift
   TaskCancellation.swift

stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -274,7 +274,3 @@ public func withUnsafeThrowingContinuation<T>(
     fn(UnsafeContinuation<T, Error>($0))
   }
 }
-
-@available(SwiftStdlib 5.5, *)
-@available(*, deprecated, message: "please use UnsafeContination<..., Error>")
-public typealias UnsafeThrowingContinuation<T> = UnsafeContinuation<T, Error>

stdlib/public/Concurrency/SourceCompatibilityShims.swift

@@ -0,0 +1,257 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+// This file provides source compatibility shims to help migrate code
+// using earlier versions of the concurrency library to the latest syntax.
+//===----------------------------------------------------------------------===//
+
+import Swift
+@_implementationOnly import _SwiftConcurrencyShims
+
+@available(SwiftStdlib 5.5, *)
+extension Task where Success == Never, Failure == Never {
+  @available(*, deprecated, message: "Task.Priority has been removed; use TaskPriority")
+  public typealias Priority = TaskPriority
+
+  @available(*, deprecated, message: "Task.Handle has been removed; use Task")
+  public typealias Handle = _Concurrency.Task
+
+  @available(*, deprecated, message: "Task.CancellationError has been removed; use CancellationError")
+  @_alwaysEmitIntoClient
+  public static func CancellationError() -> _Concurrency.CancellationError {
+    return _Concurrency.CancellationError()
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension TaskPriority {
+  @available(*, deprecated, message: "unspecified priority will be removed; use nil")
+  @_alwaysEmitIntoClient
+  public static var unspecified: TaskPriority {
+    .init(rawValue: 0x00)
+  }
+
+  @available(*, deprecated, message: "userInteractive priority will be removed")
+  @_alwaysEmitIntoClient
+  public static var userInteractive: TaskPriority {
+    .init(rawValue: 0x21)
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+@_alwaysEmitIntoClient
+public func withTaskCancellationHandler<T>(
+  handler: @Sendable () -> (),
+  operation: () async throws -> T
+) async rethrows -> T {
+  try await withTaskCancellationHandler(operation: operation, onCancel: handler)
+}
+
+@available(SwiftStdlib 5.5, *)
+extension Task where Success == Never, Failure == Never {
+  @available(*, deprecated, message: "`Task.withCancellationHandler` has been replaced by `withTaskCancellationHandler` and will be removed shortly.")
+  @_alwaysEmitIntoClient
+  public static func withCancellationHandler<T>(
+    handler: @Sendable () -> (),
+    operation: () async throws -> T
+  ) async rethrows -> T {
+    try await withTaskCancellationHandler(handler: handler, operation: operation)
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension Task where Failure == Error {
+  @discardableResult
+  @_alwaysEmitIntoClient
+  @available(*, deprecated, message: "`Task.runDetached` was replaced by `Task.detached` and will be removed shortly.")
+  public static func runDetached(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async throws -> Success
+  ) -> Task<Success, Failure> {
+    detached(priority: priority, operation: operation)
+  }
+}
+
+@discardableResult
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`detach` was replaced by `Task.detached` and will be removed shortly.")
+@_alwaysEmitIntoClient
+public func detach<T>(
+  priority: TaskPriority? = nil,
+  operation: __owned @Sendable @escaping () async -> T
+) -> Task<T, Never> {
+  Task.detached(priority: priority, operation: operation)
+}
+
+@discardableResult
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`detach` was replaced by `Task.detached` and will be removed shortly.")
+@_alwaysEmitIntoClient
+public func detach<T>(
+  priority: TaskPriority? = nil,
+  operation: __owned @Sendable @escaping () async throws -> T
+) -> Task<T, Error> {
+  Task.detached(priority: priority, operation: operation)
+}
+
+@discardableResult
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`asyncDetached` was replaced by `Task.detached` and will be removed shortly.")
+@_alwaysEmitIntoClient
+public func asyncDetached<T>(
+  priority: TaskPriority? = nil,
+  @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
+) -> Task<T, Never> {
+  return Task.detached(priority: priority, operation: operation)
+}
+
+@discardableResult
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`asyncDetached` was replaced by `Task.detached` and will be removed shortly.")
+@_alwaysEmitIntoClient
+public func asyncDetached<T>(
+  priority: TaskPriority? = nil,
+  @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
+) -> Task<T, Error> {
+  return Task.detached(priority: priority, operation: operation)
+}
+
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`async` was replaced by `Task.init` and will be removed shortly.")
+@discardableResult
+@_alwaysEmitIntoClient
+public func async<T>(
+  priority: TaskPriority? = nil,
+  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
+) -> Task<T, Never> {
+  .init(priority: priority, operation: operation)
+}
+
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "`async` was replaced by `Task.init` and will be removed shortly.")
+@discardableResult
+@_alwaysEmitIntoClient
+public func async<T>(
+  priority: TaskPriority? = nil,
+  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
+) -> Task<T, Error> {
+  .init(priority: priority, operation: operation)
+}
+
+@available(SwiftStdlib 5.5, *)
+extension Task where Success == Never, Failure == Never {
+  @available(*, deprecated, message: "`Task.Group` was replaced by `ThrowingTaskGroup` and `TaskGroup` and will be removed shortly.")
+  public typealias Group<TaskResult> = ThrowingTaskGroup<TaskResult, Error>
+
+  @available(*, deprecated, message: "`Task.withGroup` was replaced by `withThrowingTaskGroup` and `withTaskGroup` and will be removed shortly.")
+  @_alwaysEmitIntoClient
+  public static func withGroup<TaskResult, BodyResult>(
+      resultType: TaskResult.Type,
+      returning returnType: BodyResult.Type = BodyResult.self,
+      body: (inout Task.Group<TaskResult>) async throws -> BodyResult
+  ) async rethrows -> BodyResult {
+    try await withThrowingTaskGroup(of: resultType) { group in
+      try await body(&group)
+    }
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension Task {
+  @available(*, deprecated, message: "get() has been replaced by .value")
+  @_alwaysEmitIntoClient
+  public func get() async throws -> Success {
+    return try await value
+  }
+
+  @available(*, deprecated, message: "getResult() has been replaced by .result")
+  @_alwaysEmitIntoClient
+  public func getResult() async -> Result<Success, Failure>  {
+    return await result
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension Task where Failure == Never {
+  @available(*, deprecated, message: "get() has been replaced by .value")
+  @_alwaysEmitIntoClient
+  public func get() async -> Success {
+    return await value
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension TaskGroup {
+  @available(*, deprecated, renamed: "async(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func add(
+      priority: TaskPriority? = nil,
+      operation: __owned @Sendable @escaping () async -> ChildTaskResult
+  ) async -> Bool {
+    return self.asyncUnlessCancelled(priority: priority) {
+      await operation()
+    }
+  }
+
+  @available(*, deprecated, renamed: "async(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func spawn(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async -> ChildTaskResult
+  ) {
+    async(priority: priority, operation: operation)
+  }
+
+  @available(*, deprecated, renamed: "asyncUnlessCancelled(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func spawnUnlessCancelled(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async -> ChildTaskResult
+  ) -> Bool {
+    asyncUnlessCancelled(priority: priority, operation: operation)
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+extension ThrowingTaskGroup {
+  @available(*, deprecated, renamed: "async(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func add(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async throws -> ChildTaskResult
+  ) async -> Bool {
+    return self.asyncUnlessCancelled(priority: priority) {
+      try await operation()
+    }
+  }
+
+  @available(*, deprecated, renamed: "async(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func spawn(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async throws -> ChildTaskResult
+  ) {
+    async(priority: priority, operation: operation)
+  }
+
+  @available(*, deprecated, renamed: "asyncUnlessCancelled(priority:operation:)")
+  @_alwaysEmitIntoClient
+  public mutating func spawnUnlessCancelled(
+    priority: TaskPriority? = nil,
+    operation: __owned @Sendable @escaping () async throws -> ChildTaskResult
+  ) -> Bool {
+    asyncUnlessCancelled(priority: priority, operation: operation)
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+@available(*, deprecated, message: "please use UnsafeContination<..., Error>")
+public typealias UnsafeThrowingContinuation<T> = UnsafeContinuation<T, Error>