Skip to content

Update for SE-0112: ErrorProtocol has been renamed to Error #103

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
DougGregor merged 1 commit into from
Jul 12, 2016
Merged

Update for SE-0112: ErrorProtocol has been renamed to Error #103

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
8 changes: 4 additions & 4 deletions src/swift/Queue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@ public extension DispatchQueue {
private func _syncHelper<T>(
fn: (@noescape () -> ()) -> (),
execute work: @noescape () throws -> T,
rescue: ((ErrorProtocol) throws -> (T))) rethrows -> T
rescue: ((Swift.Error) throws -> (T))) rethrows -> T
{
var result: T?
var error: ErrorProtocol?
var error: Swift.Error?
fn {
do {
result = try work()
Expand All @@ -269,10 +269,10 @@ public extension DispatchQueue {
fn: (DispatchWorkItem) -> (),
flags: DispatchWorkItemFlags,
execute work: @noescape () throws -> T,
rescue: ((ErrorProtocol) throws -> (T))) rethrows -> T
rescue: ((Swift.Error) throws -> (T))) rethrows -> T
{
var result: T?
var error: ErrorProtocol?
var error: Swift.Error?
let workItem = DispatchWorkItem(flags: flags, noescapeBlock: {
do {
result = try work()
Expand Down