Skip to content

Commit a07ea37

Browse files
authored
Merge pull request swiftlang#84977 from glessard/rdar162819688-clock-run-executorjob-availability
[concurrency] new Clock and Executor symbol availability fix
2 parents 39a36d9 + 92b54e6 commit a07ea37

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

stdlib/public/Concurrency/CFExecutor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ enum CoreFoundation {
4848
// .. Main Executor ............................................................
4949

5050
/// A CFRunLoop-based main executor (Apple platforms only)
51-
@available(StdlibDeploymentTarget 6.2, *)
51+
@available(StdlibDeploymentTarget 6.3, *)
5252
final class CFMainExecutor: DispatchMainExecutor, @unchecked Sendable {
5353

5454
override public func run() throws {
@@ -64,7 +64,7 @@ final class CFMainExecutor: DispatchMainExecutor, @unchecked Sendable {
6464
// .. Task Executor ............................................................
6565

6666
/// A `TaskExecutor` to match `CFMainExecutor` (Apple platforms only)
67-
@available(StdlibDeploymentTarget 6.2, *)
67+
@available(StdlibDeploymentTarget 6.3, *)
6868
final class CFTaskExecutor: DispatchGlobalTaskExecutor,
6969
@unchecked Sendable {
7070

stdlib/public/Concurrency/Clock.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public protocol Clock<Duration>: Sendable {
5050
/// - at instant: The time at which we would like it to run.
5151
/// - tolerance: The ideal maximum delay we are willing to tolerate.
5252
///
53-
@available(StdlibDeploymentTarget 6.2, *)
53+
@available(StdlibDeploymentTarget 6.3, *)
5454
func run(_ job: consuming ExecutorJob,
5555
at instant: Instant, tolerance: Duration?)
5656

@@ -70,7 +70,7 @@ public protocol Clock<Duration>: Sendable {
7070
/// - at instant: The time at which we would like it to run.
7171
/// - tolerance: The ideal maximum delay we are willing to tolerate.
7272
///
73-
@available(StdlibDeploymentTarget 6.2, *)
73+
@available(StdlibDeploymentTarget 6.3, *)
7474
func enqueue(_ job: consuming ExecutorJob,
7575
on executor: some Executor,
7676
at instant: Instant, tolerance: Duration?)
@@ -81,7 +81,7 @@ public protocol Clock<Duration>: Sendable {
8181
extension Clock {
8282
// The default implementation works by creating a trampoline and calling
8383
// the run() method.
84-
@available(StdlibDeploymentTarget 6.2, *)
84+
@available(StdlibDeploymentTarget 6.3, *)
8585
public func enqueue(_ job: consuming ExecutorJob,
8686
on executor: some Executor,
8787
at instant: Instant, tolerance: Duration?) {
@@ -91,7 +91,7 @@ extension Clock {
9191

9292
// Clocks that do not implement run will fatalError() if you try to use
9393
// them with an executor that does not understand them.
94-
@available(StdlibDeploymentTarget 6.2, *)
94+
@available(StdlibDeploymentTarget 6.3, *)
9595
public func run(_ job: consuming ExecutorJob,
9696
at instant: Instant, tolerance: Duration?) {
9797
fatalError("\(Self.self) does not implement run(_:at:tolerance:).")

stdlib/public/Concurrency/ContinuousClock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ extension ContinuousClock.Instant: InstantProtocol {
213213
}
214214

215215
#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
216-
@available(StdlibDeploymentTarget 6.2, *)
216+
@available(StdlibDeploymentTarget 6.3, *)
217217
extension ContinuousClock {
218218

219219
public func run(_ job: consuming ExecutorJob,

stdlib/public/Concurrency/CooperativeExecutor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ final class CooperativeExecutor: Executor, @unchecked Sendable {
244244
}
245245

246246
#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
247-
@available(StdlibDeploymentTarget 6.2, *)
247+
@available(StdlibDeploymentTarget 6.3, *)
248248
extension CooperativeExecutor: SchedulingExecutor {
249249

250250
public var asScheduling: (any SchedulingExecutor)? {

stdlib/public/Concurrency/DispatchExecutor.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import Swift
2424
// .. Main Executor ............................................................
2525

2626
/// A Dispatch-based main executor.
27-
@available(StdlibDeploymentTarget 6.2, *)
27+
@available(StdlibDeploymentTarget 6.3, *)
2828
class DispatchMainExecutor: RunLoopExecutor, SchedulingExecutor,
2929
@unchecked Sendable {
3030
var threaded = false
@@ -57,7 +57,7 @@ class DispatchMainExecutor: RunLoopExecutor, SchedulingExecutor,
5757
}
5858
}
5959

60-
@available(StdlibDeploymentTarget 6.2, *)
60+
@available(StdlibDeploymentTarget 6.3, *)
6161
extension DispatchMainExecutor: SerialExecutor {
6262

6363
public func enqueue(_ job: consuming ExecutorJob) {
@@ -71,13 +71,13 @@ extension DispatchMainExecutor: SerialExecutor {
7171
}
7272
}
7373

74-
@available(StdlibDeploymentTarget 6.2, *)
74+
@available(StdlibDeploymentTarget 6.3, *)
7575
extension DispatchMainExecutor: MainExecutor {}
7676

7777
// .. Task Executor ............................................................
7878

7979
/// A Dispatch-based `TaskExecutor`
80-
@available(StdlibDeploymentTarget 6.2, *)
80+
@available(StdlibDeploymentTarget 6.3, *)
8181
class DispatchGlobalTaskExecutor: TaskExecutor, SchedulingExecutor,
8282
@unchecked Sendable {
8383
public init() {}
@@ -148,7 +148,7 @@ fileprivate func durationComponents<C: Clock>(for duration: C.Duration, clock: C
148148
fatalError("unknown clock in Dispatch Executor")
149149
}
150150

151-
@available(StdlibDeploymentTarget 6.2, *)
151+
@available(StdlibDeploymentTarget 6.3, *)
152152
fileprivate func _dispatchEnqueue<C: Clock, E: Executor>(
153153
_ job: consuming ExecutorJob,
154154
at instant: C.Instant,

stdlib/public/Concurrency/Executor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ public protocol ExecutorFactory {
604604
static var defaultExecutor: any TaskExecutor { get }
605605
}
606606

607-
@available(StdlibDeploymentTarget 6.2, *)
607+
@available(StdlibDeploymentTarget 6.3, *)
608608
typealias DefaultExecutorFactory = PlatformExecutorFactory
609609

610610
@available(StdlibDeploymentTarget 6.2, *)
@@ -616,7 +616,7 @@ public func _createExecutors<F: ExecutorFactory>(factory: F.Type) {
616616
Task._defaultExecutor = factory.defaultExecutor
617617
}
618618

619-
@available(SwiftStdlib 6.2, *)
619+
@available(SwiftStdlib 6.3, *)
620620
@_silgen_name("swift_createDefaultExecutors")
621621
func _createDefaultExecutors() {
622622
if Task._defaultExecutor == nil {

stdlib/public/Concurrency/PlatformExecutorDarwin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Swift
1616

17-
@available(StdlibDeploymentTarget 6.2, *)
17+
@available(StdlibDeploymentTarget 6.3, *)
1818
public struct PlatformExecutorFactory: ExecutorFactory {
1919
public static var mainExecutor: any MainExecutor {
2020
if CoreFoundation.isPresent {

stdlib/public/Concurrency/SuspendingClock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ extension SuspendingClock.Instant: InstantProtocol {
191191
}
192192

193193
#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
194-
@available(StdlibDeploymentTarget 6.2, *)
194+
@available(StdlibDeploymentTarget 6.3, *)
195195
extension SuspendingClock {
196196

197197
public func run(_ job: consuming ExecutorJob,

0 commit comments

Comments
 (0)