Skip to content

Commit bbf03ca

Browse files
ikesyoikesyo
authored
Merge pull request #347 from ikesyo/macos-over-osx
[gardening] Prefer macOS over OSX for `available`
2 parents 9295346 + 7e27da5 commit bbf03ca

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

‎src/swift/Block.swift‎

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

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

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

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

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

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

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

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

‎src/swift/Dispatch.swift‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import CDispatch
1616

1717
/// dispatch_assert
1818

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

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

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

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

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

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

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

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

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

7070
public enum QoSClass {
71-
@available(OSX 10.10, iOS 8.0, *)
71+
@available(macOS 10.10, iOS 8.0, *)
7272
case background
7373

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

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

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

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

8686
case unspecified
8787

8888
// _OSQoSClass is internal on Linux, so this initialiser has to
8989
// remain as an internal init.
90-
@available(OSX 10.10, iOS 8.0, *)
90+
@available(macOS 10.10, iOS 8.0, *)
9191
internal init?(rawValue: _OSQoSClass) {
9292
switch rawValue {
9393
case .QOS_CLASS_BACKGROUND: self = .background
@@ -100,7 +100,7 @@ public struct DispatchQoS : Equatable {
100100
}
101101
}
102102

103-
@available(OSX 10.10, iOS 8.0, *)
103+
@available(macOS 10.10, iOS 8.0, *)
104104
internal var rawValue: _OSQoSClass {
105105
switch self {
106106
case .background: return .QOS_CLASS_BACKGROUND
@@ -135,15 +135,15 @@ public enum DispatchTimeoutResult {
135135

136136
public extension DispatchGroup {
137137
public func notify(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], queue: DispatchQueue, execute work: @escaping @convention(block) () -> ()) {
138-
if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
138+
if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
139139
let item = DispatchWorkItem(qos: qos, flags: flags, block: work)
140140
dispatch_group_notify(self.__wrapped, queue.__wrapped, item._block)
141141
} else {
142142
dispatch_group_notify(self.__wrapped, queue.__wrapped, work)
143143
}
144144
}
145145

146-
@available(OSX 10.10, iOS 8.0, *)
146+
@available(macOS 10.10, iOS 8.0, *)
147147
public func notify(queue: DispatchQueue, work: DispatchWorkItem) {
148148
dispatch_group_notify(self.__wrapped, queue.__wrapped, work._block)
149149
}

‎src/swift/Queue.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public extension DispatchQueue {
3131

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

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

3737
fileprivate func _attr() -> dispatch_queue_attr_t? {
@@ -40,7 +40,7 @@ public extension DispatchQueue {
4040
if self.contains(.concurrent) {
4141
attr = _swift_dispatch_queue_concurrent()
4242
}
43-
if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
43+
if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
4444
if self.contains(.initiallyInactive) {
4545
attr = CDispatch.dispatch_queue_attr_make_initially_inactive(attr)
4646
}
@@ -50,19 +50,19 @@ public extension DispatchQueue {
5050
}
5151

5252
public enum GlobalQueuePriority {
53-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
53+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
5454
@available(*, deprecated: 8.0, message: "Use qos attributes instead")
5555
case high
5656

57-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
57+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
5858
@available(*, deprecated: 8.0, message: "Use qos attributes instead")
5959
case `default`
6060

61-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
61+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
6262
@available(*, deprecated: 8.0, message: "Use qos attributes instead")
6363
case low
6464

65-
@available(OSX, deprecated: 10.10, message: "Use qos attributes instead")
65+
@available(macOS, deprecated: 10.10, message: "Use qos attributes instead")
6666
@available(*, deprecated: 8.0, message: "Use qos attributes instead")
6767
case background
6868

@@ -79,14 +79,14 @@ public extension DispatchQueue {
7979
public enum AutoreleaseFrequency {
8080
case inherit
8181

82-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
82+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
8383
case workItem
8484

85-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
85+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
8686
case never
8787

8888
internal func _attr(attr: dispatch_queue_attr_t?) -> dispatch_queue_attr_t? {
89-
if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
89+
if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
9090
switch self {
9191
case .inherit:
9292
// DISPATCH_AUTORELEASE_FREQUENCY_INHERIT
@@ -112,13 +112,13 @@ public extension DispatchQueue {
112112
return DispatchQueue(queue: _swift_dispatch_get_main_queue())
113113
}
114114

115-
@available(OSX, deprecated: 10.10, message: "")
115+
@available(macOS, deprecated: 10.10, message: "")
116116
@available(*, deprecated: 8.0, message: "")
117117
public class func global(priority: GlobalQueuePriority) -> DispatchQueue {
118118
return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(priority._translatedValue, 0))
119119
}
120120

121-
@available(OSX 10.10, iOS 8.0, *)
121+
@available(macOS 10.10, iOS 8.0, *)
122122
public class func global(qos: DispatchQoS.QoSClass = .default) -> DispatchQueue {
123123
return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(Int(qos.rawValue.rawValue), 0))
124124
}
@@ -145,11 +145,11 @@ public extension DispatchQueue {
145145
if autoreleaseFrequency != .inherit {
146146
attr = autoreleaseFrequency._attr(attr: attr)
147147
}
148-
if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified {
148+
if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified {
149149
attr = CDispatch.dispatch_queue_attr_make_with_qos_class(attr, qos.qosClass.rawValue.rawValue, Int32(qos.relativePriority))
150150
}
151151

152-
if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
152+
if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
153153
self.init(__label: label, attr: attr, queue: target)
154154
} else {
155155
self.init(__label: label, attr: attr)
@@ -161,17 +161,17 @@ public extension DispatchQueue {
161161
return String(validatingUTF8: dispatch_queue_get_label(self.__wrapped))!
162162
}
163163

164-
@available(OSX 10.10, iOS 8.0, *)
164+
@available(macOS 10.10, iOS 8.0, *)
165165
public func sync(execute workItem: DispatchWorkItem) {
166166
CDispatch.dispatch_sync(self.__wrapped, workItem._block)
167167
}
168168

169-
@available(OSX 10.10, iOS 8.0, *)
169+
@available(macOS 10.10, iOS 8.0, *)
170170
public func async(execute workItem: DispatchWorkItem) {
171171
CDispatch.dispatch_async(self.__wrapped, workItem._block)
172172
}
173173

174-
@available(OSX 10.10, iOS 8.0, *)
174+
@available(macOS 10.10, iOS 8.0, *)
175175
public func async(group: DispatchGroup, execute workItem: DispatchWorkItem) {
176176
CDispatch.dispatch_group_async(group.__wrapped, self.__wrapped, workItem._block)
177177
}
@@ -194,7 +194,7 @@ public extension DispatchQueue {
194194
}
195195

196196
var block: @convention(block) () -> Void = work
197-
if #available(OSX 10.10, iOS 8.0, *), (qos != .unspecified || !flags.isEmpty) {
197+
if #available(macOS 10.10, iOS 8.0, *), (qos != .unspecified || !flags.isEmpty) {
198198
let workItem = DispatchWorkItem(qos: qos, flags: flags, block: work)
199199
block = workItem._block
200200
}
@@ -233,7 +233,7 @@ public extension DispatchQueue {
233233
}
234234
}
235235

236-
@available(OSX 10.10, iOS 8.0, *)
236+
@available(macOS 10.10, iOS 8.0, *)
237237
private func _syncHelper<T>(
238238
fn: (DispatchWorkItem) -> (),
239239
flags: DispatchWorkItemFlags,
@@ -264,7 +264,7 @@ public extension DispatchQueue {
264264
public func sync<T>(flags: DispatchWorkItemFlags, execute work: () throws -> T) rethrows -> T {
265265
if flags == .barrier {
266266
return try self._syncHelper(fn: _syncBarrier, execute: work, rescue: { throw $0 })
267-
} else if #available(OSX 10.10, iOS 8.0, *), !flags.isEmpty {
267+
} else if #available(macOS 10.10, iOS 8.0, *), !flags.isEmpty {
268268
return try self._syncHelper(fn: sync, flags: flags, execute: work, rescue: { throw $0 })
269269
} else {
270270
return try self._syncHelper(fn: sync, execute: work, rescue: { throw $0 })
@@ -277,7 +277,7 @@ public extension DispatchQueue {
277277
flags: DispatchWorkItemFlags = [],
278278
execute work: @escaping @convention(block) () -> Void)
279279
{
280-
if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
280+
if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
281281
let item = DispatchWorkItem(qos: qos, flags: flags, block: work)
282282
CDispatch.dispatch_after(deadline.rawValue, self.__wrapped, item._block)
283283
} else {
@@ -291,25 +291,25 @@ public extension DispatchQueue {
291291
flags: DispatchWorkItemFlags = [],
292292
execute work: @escaping @convention(block) () -> Void)
293293
{
294-
if #available(OSX 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
294+
if #available(macOS 10.10, iOS 8.0, *), qos != .unspecified || !flags.isEmpty {
295295
let item = DispatchWorkItem(qos: qos, flags: flags, block: work)
296296
CDispatch.dispatch_after(wallDeadline.rawValue, self.__wrapped, item._block)
297297
} else {
298298
CDispatch.dispatch_after(wallDeadline.rawValue, self.__wrapped, work)
299299
}
300300
}
301301

302-
@available(OSX 10.10, iOS 8.0, *)
302+
@available(macOS 10.10, iOS 8.0, *)
303303
public func asyncAfter(deadline: DispatchTime, execute: DispatchWorkItem) {
304304
CDispatch.dispatch_after(deadline.rawValue, self.__wrapped, execute._block)
305305
}
306306

307-
@available(OSX 10.10, iOS 8.0, *)
307+
@available(macOS 10.10, iOS 8.0, *)
308308
public func asyncAfter(wallDeadline: DispatchWallTime, execute: DispatchWorkItem) {
309309
CDispatch.dispatch_after(wallDeadline.rawValue, self.__wrapped, execute._block)
310310
}
311311

312-
@available(OSX 10.10, iOS 8.0, *)
312+
@available(macOS 10.10, iOS 8.0, *)
313313
public var qos: DispatchQoS {
314314
var relPri: Int32 = 0
315315
let cls = DispatchQoS.QoSClass(rawValue: _OSQoSClass(qosClass: dispatch_queue_get_qos_class(self.__wrapped, &relPri))!)!

‎src/swift/Source.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,48 @@ import _SwiftDispatchOverlayShims
1616
public extension DispatchSourceProtocol {
1717

1818
public func setEventHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) {
19-
if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
19+
if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
2020
let item = DispatchWorkItem(qos: qos, flags: flags, block: h)
2121
CDispatch.dispatch_source_set_event_handler((self as! DispatchSource).__wrapped, item._block)
2222
} else {
2323
CDispatch.dispatch_source_set_event_handler((self as! DispatchSource).__wrapped, handler)
2424
}
2525
}
2626

27-
@available(OSX 10.10, iOS 8.0, *)
27+
@available(macOS 10.10, iOS 8.0, *)
2828
public func setEventHandler(handler: DispatchWorkItem) {
2929
CDispatch.dispatch_source_set_event_handler((self as! DispatchSource).__wrapped, handler._block)
3030
}
3131

3232
public func setCancelHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) {
33-
if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
33+
if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
3434
let item = DispatchWorkItem(qos: qos, flags: flags, block: h)
3535
CDispatch.dispatch_source_set_cancel_handler((self as! DispatchSource).__wrapped, item._block)
3636
} else {
3737
CDispatch.dispatch_source_set_cancel_handler((self as! DispatchSource).__wrapped, handler)
3838
}
3939
}
4040

41-
@available(OSX 10.10, iOS 8.0, *)
41+
@available(macOS 10.10, iOS 8.0, *)
4242
public func setCancelHandler(handler: DispatchWorkItem) {
4343
CDispatch.dispatch_source_set_cancel_handler((self as! DispatchSource).__wrapped, handler._block)
4444
}
4545

4646
public func setRegistrationHandler(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], handler: DispatchSourceHandler?) {
47-
if #available(OSX 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
47+
if #available(macOS 10.10, iOS 8.0, *), let h = handler, qos != .unspecified || !flags.isEmpty {
4848
let item = DispatchWorkItem(qos: qos, flags: flags, block: h)
4949
CDispatch.dispatch_source_set_registration_handler((self as! DispatchSource).__wrapped, item._block)
5050
} else {
5151
CDispatch.dispatch_source_set_registration_handler((self as! DispatchSource).__wrapped, handler)
5252
}
5353
}
5454

55-
@available(OSX 10.10, iOS 8.0, *)
55+
@available(macOS 10.10, iOS 8.0, *)
5656
public func setRegistrationHandler(handler: DispatchWorkItem) {
5757
CDispatch.dispatch_source_set_registration_handler((self as! DispatchSource).__wrapped, handler._block)
5858
}
5959

60-
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
60+
@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
6161
public func activate() {
6262
(self as! DispatchSource).activate()
6363
}

0 commit comments

Comments
 (0)