Skip to content

Commit e905735

Browse files
authored
Merge pull request swiftlang#163 from dgrove-oss/sr-2356
SR-2356 : Remove temporary APIs from Linux overlay
2 parents 01fd776 + ece47b4 commit e905735

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

src/swift/Block.swift

-7
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ public class DispatchWorkItem {
3939
internal var _block: _DispatchBlock
4040
internal var _group: DispatchGroup?
4141

42-
// Temporary for swift-corelibs-foundation
43-
@available(*, deprecated, renamed: "DispatchWorkItem(qos:flags:block:)")
44-
public convenience init(group: DispatchGroup, qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], block: @escaping @convention(block) () -> ()) {
45-
self.init(qos: qos, flags: flags, block: block)
46-
47-
}
48-
4942
public init(qos: DispatchQoS = .unspecified, flags: DispatchWorkItemFlags = [], block: @escaping @convention(block) () -> ()) {
5043
_block = dispatch_block_create_with_qos_class(dispatch_block_flags_t(flags.rawValue),
5144
qos.qosClass.rawValue.rawValue, Int32(qos.relativePriority), block)

src/swift/Queue.swift

-42
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@ internal class _DispatchSpecificValue<T> {
2323
internal init(value: T) { self.value = value }
2424
}
2525

26-
// Temporary for swift-corelibs-foundation
27-
@available(*, deprecated, renamed: "DispatchQueue.Attributes")
28-
public struct DispatchQueueAttributes : OptionSet {
29-
public let rawValue: UInt64
30-
public init(rawValue: UInt64) { self.rawValue = rawValue }
31-
32-
public static let serial = DispatchQueueAttributes(rawValue: 1<<0)
33-
public static let concurrent = DispatchQueueAttributes(rawValue: 1<<1)
34-
35-
fileprivate var _translatedValue: DispatchQueue.Attributes {
36-
if self.contains(.concurrent) { return .concurrent }
37-
return []
38-
}
39-
}
40-
4126
public extension DispatchQueue {
4227
public struct Attributes : OptionSet {
4328
public let rawValue: UInt64
@@ -90,18 +75,6 @@ public extension DispatchQueue {
9075
}
9176
}
9277

93-
// Temporary for swift-corelibs-foundation
94-
@available(*, deprecated, renamed: "DispatchQoS")
95-
public enum GlobalQueueDeprecatedPriority {
96-
case qosBackground
97-
98-
fileprivate var _translatedValue: DispatchQoS.QoSClass {
99-
switch self {
100-
case .qosBackground: return .background
101-
}
102-
}
103-
}
104-
10578
public enum AutoreleaseFrequency {
10679
case inherit
10780

@@ -144,12 +117,6 @@ public extension DispatchQueue {
144117
return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(priority._translatedValue, 0))
145118
}
146119

147-
// Temporary for swift-corelibs-foundation
148-
@available(*, deprecated, renamed: "DispatchQueue.global(qos:)")
149-
public class func global(attributes: GlobalQueueDeprecatedPriority) -> DispatchQueue {
150-
return global(qos: attributes._translatedValue)
151-
}
152-
153120
@available(OSX 10.10, iOS 8.0, *)
154121
public class func global(qos: DispatchQoS.QoSClass = .default) -> DispatchQueue {
155122
return DispatchQueue(queue: CDispatch.dispatch_get_global_queue(Int(qos.rawValue.rawValue), 0))
@@ -166,15 +133,6 @@ public extension DispatchQueue {
166133
return nil
167134
}
168135

169-
// Temporary for swift-corelibs-foundation
170-
@available(*, deprecated, renamed: "DispatchQueue(label:attributes:)")
171-
public convenience init(
172-
label: String,
173-
attributes: DispatchQueueAttributes)
174-
{
175-
self.init(label: label, attributes: attributes._translatedValue)
176-
}
177-
178136
public convenience init(
179137
label: String,
180138
qos: DispatchQoS = .unspecified,

0 commit comments

Comments
 (0)