Skip to content

Commit 4d8b619

Browse files
ikesyoktopley-apple
authored andcommitted
[gardening] Prefer macOS over OSX for #available
Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
1 parent 6da10a1 commit 4d8b619

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/swift/Dispatch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ 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 {

src/swift/Queue.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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
}
@@ -86,7 +86,7 @@ public extension DispatchQueue {
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
@@ -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)
@@ -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
}
@@ -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,7 +291,7 @@ 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 {

src/swift/Source.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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 {
@@ -30,7 +30,7 @@ public extension DispatchSourceProtocol {
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 {
@@ -44,7 +44,7 @@ public extension DispatchSourceProtocol {
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 {

0 commit comments

Comments
 (0)