Skip to content

Commit eae03cb

Browse files
DougGregorDougGregor
authored
Merge pull request #15292 from ikesyo/dispatch-macos-over-osx
[gardening][Dispatch] Prefer macOS over OSX for `@available`
2 parents 86fb3fa + 70ab828 commit eae03cb

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎stdlib/public/SDK/Dispatch/Block.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ public struct DispatchWorkItemFlags : OptionSet, RawRepresentable {
1818

1919
public static let barrier = DispatchWorkItemFlags(rawValue: 0x1)
2020

21-
@available(OSX 10.10, iOS 8.0, *)
21+
@available(macOS 10.10, iOS 8.0, *)
2222
public static let detached = DispatchWorkItemFlags(rawValue: 0x2)
2323

24-
@available(OSX 10.10, iOS 8.0, *)
24+
@available(macOS 10.10, iOS 8.0, *)
2525
public static let assignCurrentContext = DispatchWorkItemFlags(rawValue: 0x4)
2626

27-
@available(OSX 10.10, iOS 8.0, *)
27+
@available(macOS 10.10, iOS 8.0, *)
2828
public static let noQoS = DispatchWorkItemFlags(rawValue: 0x8)
2929

30-
@available(OSX 10.10, iOS 8.0, *)
30+
@available(macOS 10.10, iOS 8.0, *)
3131
public static let inheritQoS = DispatchWorkItemFlags(rawValue: 0x10)
3232

33-
@available(OSX 10.10, iOS 8.0, *)
33+
@available(macOS 10.10, iOS 8.0, *)
3434
public static let enforceQoS = DispatchWorkItemFlags(rawValue: 0x20)
3535
}
3636

37-
@available(OSX 10.10, iOS 8.0, *)
37+
@available(macOS 10.10, iOS 8.0, *)
3838
public class DispatchWorkItem {
3939
internal var _block: _DispatchBlock
4040

‎stdlib/public/SDK/Dispatch/Dispatch.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import _SwiftDispatchOverlayShims
1515

1616
/// dispatch_assert
1717

18-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
18+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
1919
public enum DispatchPredicate {
2020
case onQueue(DispatchQueue)
2121
case onQueueAsBarrier(DispatchQueue)
2222
case notOnQueue(DispatchQueue)
2323
}
2424

25-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
25+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
2626
public func _dispatchPreconditionTest(_ condition: DispatchPredicate) -> Bool {
2727
switch condition {
2828
case .onQueue(let q):
@@ -36,7 +36,7 @@ public func _dispatchPreconditionTest(_ condition: DispatchPredicate) -> Bool {
3636
}
3737

3838
@_transparent
39-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
39+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
4040
public func dispatchPrecondition(condition: @autoclosure () -> DispatchPredicate) {
4141
// precondition is able to determine release-vs-debug asserts where the overlay
4242
// cannot, so formulating this into a call that we can call with precondition()
@@ -49,42 +49,42 @@ public struct DispatchQoS : Equatable {
4949
public let qosClass: QoSClass
5050
public let relativePriority: Int
5151

52-
@available(OSX 10.10, iOS 8.0, *)
52+
@available(macOS 10.10, iOS 8.0, *)
5353
public static let background = DispatchQoS(qosClass: .background, relativePriority: 0)
5454

55-
@available(OSX 10.10, iOS 8.0, *)
55+
@available(macOS 10.10, iOS 8.0, *)
5656
public static let utility = DispatchQoS(qosClass: .utility, relativePriority: 0)
5757

58-
@available(OSX 10.10, iOS 8.0, *)
58+
@available(macOS 10.10, iOS 8.0, *)
5959
public static let `default` = DispatchQoS(qosClass: .default, relativePriority: 0)
6060

61-
@available(OSX 10.10, iOS 8.0, *)
61+
@available(macOS 10.10, iOS 8.0, *)
6262
public static let userInitiated = DispatchQoS(qosClass: .userInitiated, relativePriority: 0)
6363

64-
@available(OSX 10.10, iOS 8.0, *)
64+
@available(macOS 10.10, iOS 8.0, *)
6565
public static let userInteractive = DispatchQoS(qosClass: .userInteractive, relativePriority: 0)
6666

6767
public static let unspecified = DispatchQoS(qosClass: .unspecified, relativePriority: 0)
6868

6969
public enum QoSClass {
70-
@available(OSX 10.10, iOS 8.0, *)
70+
@available(macOS 10.10, iOS 8.0, *)
7171
case background
7272

73-
@available(OSX 10.10, iOS 8.0, *)
73+
@available(macOS 10.10, iOS 8.0, *)
7474
case utility
7575

76-
@available(OSX 10.10, iOS 8.0, *)
76+
@available(macOS 10.10, iOS 8.0, *)
7777
case `default`
7878

79-
@available(OSX 10.10, iOS 8.0, *)
79+
@available(macOS 10.10, iOS 8.0, *)
8080
case userInitiated
8181

82-
@available(OSX 10.10, iOS 8.0, *)
82+
@available(macOS 10.10, iOS 8.0, *)
8383
case userInteractive
8484

8585
case unspecified
8686

87-
@available(OSX 10.10, iOS 8.0, *)
87+
@available(macOS 10.10, iOS 8.0, *)
8888
public init?(rawValue: qos_class_t) {
8989
switch rawValue {
9090
case QOS_CLASS_BACKGROUND: self = .background
@@ -97,7 +97,7 @@ public struct DispatchQoS : Equatable {
9797
}
9898
}
9999

100-
@available(OSX 10.10, iOS 8.0, *)
100+
@available(macOS 10.10, iOS 8.0, *)
101101
public var rawValue: qos_class_t {
102102
switch self {
103103
case .background: return QOS_CLASS_BACKGROUND
@@ -139,7 +139,7 @@ public extension DispatchGroup {
139139
}
140140
}
141141

142-
@available(OSX 10.10, iOS 8.0, *)
142+
@available(macOS 10.10, iOS 8.0, *)
143143
public func notify(queue: DispatchQueue, work: DispatchWorkItem) {
144144
_swift_dispatch_group_notify(self, queue, work._block)
145145
}

‎stdlib/public/SDK/Dispatch/Queue.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public extension DispatchQueue {
3030

3131
public static let concurrent = Attributes(rawValue: 1<<1)
3232

33-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
33+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
3434
public static let initiallyInactive = Attributes(rawValue: 1<<2)
3535

3636
fileprivate func _attr() -> __OS_dispatch_queue_attr? {
@@ -49,25 +49,25 @@ public extension DispatchQueue {
4949
}
5050

5151
public enum GlobalQueuePriority {
52-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
52+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
5353
@available(iOS, deprecated: 8.0, message: "Use qos attributes instead")
5454
@available(tvOS, deprecated, message: "Use qos attributes instead")
5555
@available(watchOS, deprecated, message: "Use qos attributes instead")
5656
case high
5757

58-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
58+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
5959
@available(iOS, deprecated: 8.0, message: "Use qos attributes instead")
6060
@available(tvOS, deprecated, message: "Use qos attributes instead")
6161
@available(watchOS, deprecated, message: "Use qos attributes instead")
6262
case `default`
6363

64-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
64+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
6565
@available(iOS, deprecated: 8.0, message: "Use qos attributes instead")
6666
@available(tvOS, deprecated, message: "Use qos attributes instead")
6767
@available(watchOS, deprecated, message: "Use qos attributes instead")
6868
case low
6969

70-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
70+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
7171
@available(iOS, deprecated: 8.0, message: "Use qos attributes instead")
7272
@available(tvOS, deprecated, message: "Use qos attributes instead")
7373
@available(watchOS, deprecated, message: "Use qos attributes instead")
@@ -86,10 +86,10 @@ public extension DispatchQueue {
8686
public enum AutoreleaseFrequency {
8787
case inherit
8888

89-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
89+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
9090
case workItem
9191

92-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
92+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
9393
case never
9494

9595
internal func _attr(attr: __OS_dispatch_queue_attr?) -> __OS_dispatch_queue_attr? {
@@ -119,15 +119,15 @@ public extension DispatchQueue {
119119
return _swift_dispatch_get_main_queue()
120120
}
121121

122-
@available(OSX, deprecated: 10.10)
122+
@available(macOS, deprecated: 10.10)
123123
@available(iOS, deprecated: 8.0)
124124
@available(tvOS, deprecated)
125125
@available(watchOS, deprecated)
126126
public class func global(priority: GlobalQueuePriority) -> DispatchQueue {
127127
return __dispatch_get_global_queue(priority._translatedValue, 0)
128128
}
129129

130-
@available(OSX 10.10, iOS 8.0, *)
130+
@available(macOS 10.10, iOS 8.0, *)
131131
public class func global(qos: DispatchQoS.QoSClass = .default) -> DispatchQueue {
132132
return __dispatch_get_global_queue(Int(qos.rawValue.rawValue), 0)
133133
}
@@ -170,21 +170,21 @@ public extension DispatchQueue {
170170
return String(validatingUTF8: __dispatch_queue_get_label(self))!
171171
}
172172

173-
@available(OSX 10.10, iOS 8.0, *)
173+
@available(macOS 10.10, iOS 8.0, *)
174174
public func sync(execute workItem: DispatchWorkItem) {
175175
// _swift_dispatch_sync preserves the @convention(block) for
176176
// work item blocks.
177177
_swift_dispatch_sync(self, workItem._block)
178178
}
179179

180-
@available(OSX 10.10, iOS 8.0, *)
180+
@available(macOS 10.10, iOS 8.0, *)
181181
public func async(execute workItem: DispatchWorkItem) {
182182
// _swift_dispatch_async preserves the @convention(block)
183183
// for work item blocks.
184184
_swift_dispatch_async(self, workItem._block)
185185
}
186186

187-
@available(OSX 10.10, iOS 8.0, *)
187+
@available(macOS 10.10, iOS 8.0, *)
188188
public func async(group: DispatchGroup, execute workItem: DispatchWorkItem) {
189189
// _swift_dispatch_group_async preserves the @convention(block)
190190
// for work item blocks.
@@ -248,7 +248,7 @@ public extension DispatchQueue {
248248
}
249249
}
250250

251-
@available(OSX 10.10, iOS 8.0, *)
251+
@available(macOS 10.10, iOS 8.0, *)
252252
private func _syncHelper<T>(
253253
fn: (DispatchWorkItem) -> Void,
254254
flags: DispatchWorkItemFlags,
@@ -314,17 +314,17 @@ public extension DispatchQueue {
314314
}
315315
}
316316

317-
@available(OSX 10.10, iOS 8.0, *)
317+
@available(macOS 10.10, iOS 8.0, *)
318318
public func asyncAfter(deadline: DispatchTime, execute: DispatchWorkItem) {
319319
_swift_dispatch_after(deadline.rawValue, self, execute._block)
320320
}
321321

322-
@available(OSX 10.10, iOS 8.0, *)
322+
@available(macOS 10.10, iOS 8.0, *)
323323
public func asyncAfter(wallDeadline: DispatchWallTime, execute: DispatchWorkItem) {
324324
_swift_dispatch_after(wallDeadline.rawValue, self, execute._block)
325325
}
326326

327-
@available(OSX 10.10, iOS 8.0, *)
327+
@available(macOS 10.10, iOS 8.0, *)
328328
public var qos: DispatchQoS {
329329
var relPri: Int32 = 0
330330
let cls = DispatchQoS.QoSClass(rawValue: __dispatch_queue_get_qos_class(self, &relPri))!

‎stdlib/public/SDK/Dispatch/Source.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public extension DispatchSourceProtocol {
2727
}
2828
}
2929

30-
@available(OSX 10.10, iOS 8.0, *)
30+
@available(macOS 10.10, iOS 8.0, *)
3131
public func setEventHandler(handler: DispatchWorkItem) {
3232
_swift_dispatch_source_set_event_handler(self as! DispatchSource, handler._block)
3333
}
@@ -43,7 +43,7 @@ public extension DispatchSourceProtocol {
4343
}
4444
}
4545

46-
@available(OSX 10.10, iOS 8.0, *)
46+
@available(macOS 10.10, iOS 8.0, *)
4747
public func setCancelHandler(handler: DispatchWorkItem) {
4848
_swift_dispatch_source_set_cancel_handler(self as! DispatchSource, handler._block)
4949
}
@@ -59,12 +59,12 @@ public extension DispatchSourceProtocol {
5959
}
6060
}
6161

62-
@available(OSX 10.10, iOS 8.0, *)
62+
@available(macOS 10.10, iOS 8.0, *)
6363
public func setRegistrationHandler(handler: DispatchWorkItem) {
6464
_swift_dispatch_source_set_registration_handler(self as! DispatchSource, handler._block)
6565
}
6666

67-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
67+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
6868
public func activate() {
6969
(self as! DispatchSource).activate()
7070
}

0 commit comments

Comments
 (0)