Skip to content

[libdispatch-fixits] Address stale or incorrect fixits #3635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2016
Merged

[libdispatch-fixits] Address stale or incorrect fixits #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions stdlib/public/SDK/Dispatch/Private.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

// Redeclarations of all SwiftPrivate functions with appropriate markup.

@available(*, unavailable, renamed:"DispatchQueue.init(label:attributes:target:)")
@available(*, unavailable, renamed:"DispatchQueue.init(label:qos:attributes:autoreleaseFrequency:target:)")
public func dispatch_queue_create(_ label: UnsafePointer<Int8>?, _ attr: __OS_dispatch_queue_attr?) -> DispatchQueue
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueue.init(label:attributes:target:)")
@available(*, unavailable, renamed:"DispatchQueue.init(label:qos:attributes:autoreleaseFrequency:target:)")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if this one will actually produce working Fix-Its, because the # of arguments doesn't match up, but it will still give a reasonable diagnostic.

public func dispatch_queue_create_with_target(_ label: UnsafePointer<Int8>?, _ attr: __OS_dispatch_queue_attr?, _ queue: DispatchQueue?) -> DispatchQueue
{
fatalError()
Expand Down Expand Up @@ -156,25 +156,25 @@ public func dispatch_get_global_queue(_ identifier: Int, _ flags: UInt) -> Dispa
fatalError()
}

@available(*, unavailable, renamed: "DispatchQueue.main")
@available(*, unavailable, renamed: "getter:DispatchQueue.main()")
public func dispatch_get_main_queue() -> DispatchQueue
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueueAttributes.initiallyInactive")
@available(*, unavailable, renamed:"DispatchQueue.Attributes.initiallyInactive")
public func dispatch_queue_attr_make_initially_inactive(_ attr: __OS_dispatch_queue_attr?) -> __OS_dispatch_queue_attr
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueueAttributes.autoreleaseWorkItem")
@available(*, unavailable, renamed:"DispatchQueue.AutoreleaseFrequency.workItem")
public func dispatch_queue_attr_make_with_autorelease_frequency(_ attr: __OS_dispatch_queue_attr?, _ frequency: __dispatch_autorelease_frequency_t) -> __OS_dispatch_queue_attr
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueueAttributes.qosUserInitiated")
@available(*, unavailable, renamed:"DispatchQoS")
public func dispatch_queue_attr_make_with_qos_class(_ attr: __OS_dispatch_queue_attr?, _ qos_class: qos_class_t, _ relative_priority: Int32) -> __OS_dispatch_queue_attr
{
fatalError()
Expand All @@ -192,19 +192,19 @@ public func dispatch_queue_get_qos_class(_ queue: DispatchQueue, _ relative_prio
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueue.after(self:when:execute:)")
@available(*, unavailable, renamed:"DispatchQueue.asyncAfter(self:deadline:qos:flags:execute:)")
public func dispatch_after(_ when: dispatch_time_t, _ queue: DispatchQueue, _ block: () -> Void)
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueue.asynchronously(self:group:qos:flags:execute:)")
@available(*, unavailable, renamed:"DispatchQueue.async(self:group:qos:flags:execute:)")
public func dispatch_barrier_async(_ queue: DispatchQueue, _ block: () -> Void)
{
fatalError()
}

@available(*, unavailable, renamed:"DispatchQueue.synchronously(self:flags:execute:)")
@available(*, unavailable, renamed:"DispatchQueue.sync(self:flags:execute:)")
public func dispatch_barrier_sync(_ queue: DispatchQueue, _ block: @noescape () -> Void)
{
fatalError()
Expand Down Expand Up @@ -336,22 +336,22 @@ public func dispatch_walltime(_ when: UnsafePointer<timespec>?, _ delta: Int64)
fatalError()
}

@available(*, unavailable, renamed: "DispatchQueue.GlobalAttributes.qosUserInitiated")
@available(*, unavailable, renamed: "DispatchQueue.GlobalQueuePriority.high")
public var DISPATCH_QUEUE_PRIORITY_HIGH: Int {
fatalError()
}

@available(*, unavailable, renamed: "DispatchQueue.GlobalAttributes.qosDefault")
@available(*, unavailable, renamed: "DispatchQueue.GlobalQueuePriority.default")
public var DISPATCH_QUEUE_PRIORITY_DEFAULT: Int {
fatalError()
}

@available(*, unavailable, renamed: "DispatchQueue.GlobalAttributes.qosUtility")
@available(*, unavailable, renamed: "DispatchQueue.GlobalQueuePriority.low")
public var DISPATCH_QUEUE_PRIORITY_LOW: Int {
fatalError()
}

@available(*, unavailable, renamed: "DispatchQueue.GlobalAttributes.qosBackground")
@available(*, unavailable, renamed: "DispatchQueue.GlobalQueuePriority.background")
public var DISPATCH_QUEUE_PRIORITY_BACKGROUND: Int {
fatalError()
}
Expand Down
4 changes: 2 additions & 2 deletions test/1_stdlib/DispatchRenames.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

import Dispatch

let q = dispatch_queue_create("", nil) // expected-error {{'dispatch_queue_create' has been replaced by 'DispatchQueue.init(label:attributes:target:)'}}
let q = dispatch_queue_create("", nil) // expected-error {{'dispatch_queue_create' has been replaced by 'DispatchQueue.init(label:qos:attributes:autoreleaseFrequency:target:)'}}

_ = dispatch_queue_get_label(q) // expected-error {{'dispatch_queue_get_label' has been replaced by property 'DispatchQueue.label'}}

_ = dispatch_get_global_queue(0, 0) // expected-error {{'dispatch_get_global_queue' has been replaced by 'DispatchQueue.global(attributes:)'}}

_ = dispatch_source_create(OpaquePointer(bitPattern: ~0)!, 0, 0, nil) // expected-error {{'dispatch_source_create' is unavailable: Use DispatchSource class methods}}

_ = dispatch_get_main_queue() // expected-error {{'dispatch_get_main_queue()' has been renamed to 'DispatchQueue.main'}}
_ = dispatch_get_main_queue() // expected-error {{'dispatch_get_main_queue()' has been replaced by property 'DispatchQueue.main'}}
_ = DispatchQueue.main