From 7a0fd97b4ee78cf30b9195ab89384967d5ce3dc1 Mon Sep 17 00:00:00 2001 From: Honza Dvorsky Date: Wed, 27 Jul 2016 11:03:51 +0200 Subject: [PATCH] Updated to Swift 07-25 (#28) --- .swift-version | 2 +- .travis.yml | 6 ++--- Package.swift | 2 +- .../FallibleChannel/FallibleChannel.swift | 8 +++---- .../FallibleSendingChannel.swift | 4 ++-- Source/Venice/Poll/Poll.swift | 2 +- Source/Venice/Select/Select.swift | 24 +++++++++---------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.swift-version b/.swift-version index 2469c8d..fbe576f 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -DEVELOPMENT-SNAPSHOT-2016-06-20-a +DEVELOPMENT-SNAPSHOT-2016-07-25-a diff --git a/.travis.yml b/.travis.yml index 180eefc..056867a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ os: language: generic sudo: required dist: trusty -osx_image: xcode7.3 +osx_image: xcode8 install: - eval "$(curl -sL https://raw.githubusercontent.com/Zewo/Zewo/5254525d9da56df29346fd76e99529c22034d61d/Scripts/install-swiftenv.sh)" script: - - swift build -Xlinker -rpath -Xlinker $(pwd)/.build/debug/ - - swift build --configuration release -Xlinker -rpath -Xlinker $(pwd)/.build/release/ + - swift build + - swift build --configuration release - swift test diff --git a/Package.swift b/Package.swift index 7b0fc10..e00e909 100644 --- a/Package.swift +++ b/Package.swift @@ -4,6 +4,6 @@ let package = Package( name: "Venice", dependencies: [ .Package(url: "https://github.com/VeniceX/CLibvenice.git", majorVersion: 0, minor: 6), - .Package(url: "https://github.com/open-swift/C7.git", majorVersion: 0, minor: 9), + .Package(url: "https://github.com/open-swift/C7.git", majorVersion: 0, minor: 10), ] ) diff --git a/Source/Venice/FallibleChannel/FallibleChannel.swift b/Source/Venice/FallibleChannel/FallibleChannel.swift index f7076cb..3ef0792 100644 --- a/Source/Venice/FallibleChannel/FallibleChannel.swift +++ b/Source/Venice/FallibleChannel/FallibleChannel.swift @@ -34,7 +34,7 @@ public struct FallibleChannelGenerator: IteratorProtocol { public enum ChannelResult { case value(T) - case error(ErrorProtocol) + case error(Error) public func success(_ closure: @noescape (T) -> Void) { switch self { @@ -43,7 +43,7 @@ public enum ChannelResult { } } - public func failure(_ closure: @noescape (ErrorProtocol) -> Void) { + public func failure(_ closure: @noescape (Error) -> Void) { switch self { case .error(let error): closure(error) default: break @@ -115,7 +115,7 @@ public final class FallibleChannel: Sequence { } /// Send an error to the channel. - public func send(_ error: ErrorProtocol) { + public func send(_ error: Error) { if !closed { let result = ChannelResult.error(error) buffer.append(result) @@ -123,7 +123,7 @@ public final class FallibleChannel: Sequence { } } - internal func send(_ error: ErrorProtocol, clause: UnsafeMutablePointer, index: Int) { + internal func send(_ error: Error, clause: UnsafeMutablePointer, index: Int) { if !closed { let result = ChannelResult.error(error) buffer.append(result) diff --git a/Source/Venice/FallibleChannel/FallibleSendingChannel.swift b/Source/Venice/FallibleChannel/FallibleSendingChannel.swift index 94bc393..2911552 100644 --- a/Source/Venice/FallibleChannel/FallibleSendingChannel.swift +++ b/Source/Venice/FallibleChannel/FallibleSendingChannel.swift @@ -41,11 +41,11 @@ public final class FallibleSendingChannel { return channel.send(value, clause: clause, index: index) } - public func send(_ error: ErrorProtocol) { + public func send(_ error: Error) { return channel.send(error) } - internal func send(_ error: ErrorProtocol, clause: UnsafeMutablePointer, index: Int) { + internal func send(_ error: Error, clause: UnsafeMutablePointer, index: Int) { return channel.send(error, clause: clause, index: index) } diff --git a/Source/Venice/Poll/Poll.swift b/Source/Venice/Poll/Poll.swift index 2cbbaf8..c784926 100644 --- a/Source/Venice/Poll/Poll.swift +++ b/Source/Venice/Poll/Poll.swift @@ -27,7 +27,7 @@ import C7 public typealias FileDescriptor = Int32 -public enum PollError: ErrorProtocol { +public enum PollError: Error { case timeout case failure } diff --git a/Source/Venice/Select/Select.swift b/Source/Venice/Select/Select.swift index 609e8e3..399046e 100644 --- a/Source/Venice/Select/Select.swift +++ b/Source/Venice/Select/Select.swift @@ -191,10 +191,10 @@ final class FallibleSendingChannelSendCase: SelectCase { final class FallibleChannelSendErrorCase: SelectCase { let channel: FallibleChannel - let error: ErrorProtocol + let error: Error let closure: (Void) -> Void - init(channel: FallibleChannel, error: ErrorProtocol, closure: (Void) -> Void) { + init(channel: FallibleChannel, error: Error, closure: (Void) -> Void) { self.channel = channel self.error = error self.closure = closure @@ -211,10 +211,10 @@ final class FallibleChannelSendErrorCase: SelectCase { final class FallibleSendingChannelSendErrorCase: SelectCase { let channel: FallibleSendingChannel - let error: ErrorProtocol + let error: Error let closure: (Void) -> Void - init(channel: FallibleSendingChannel, error: ErrorProtocol, closure: (Void) -> Void) { + init(channel: FallibleSendingChannel, error: Error, closure: (Void) -> Void) { self.channel = channel self.error = error self.closure = closure @@ -280,42 +280,42 @@ public class SelectCaseBuilder { } public func sent(_ value: T, to channel: Channel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + if let channel = channel, !channel.closed { let selectCase = ChannelSendCase(channel: channel, value: value, closure: closure) cases.append(selectCase) } } public func sent(_ value: T, to channel: SendingChannel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + if let channel = channel, !channel.closed { let selectCase = SendingChannelSendCase(channel: channel, value: value, closure: closure) cases.append(selectCase) } } public func sent(_ value: T, to channel: FallibleChannel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + if let channel = channel, !channel.closed { let selectCase = FallibleChannelSendCase(channel: channel, value: value, closure: closure) cases.append(selectCase) } } public func sent(_ value: T, to channel: FallibleSendingChannel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + if let channel = channel, !channel.closed { let selectCase = FallibleSendingChannelSendCase(channel: channel, value: value, closure: closure) cases.append(selectCase) } } - public func sent(_ error: ErrorProtocol, to channel: FallibleChannel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + public func sent(_ error: Error, to channel: FallibleChannel?, closure: (Void) -> Void) { + if let channel = channel, !channel.closed { let selectCase = FallibleChannelSendErrorCase(channel: channel, error: error, closure: closure) cases.append(selectCase) } } - public func sent(_ error: ErrorProtocol, to channel: FallibleSendingChannel?, closure: (Void) -> Void) { - if let channel = channel where !channel.closed { + public func sent(_ error: Error, to channel: FallibleSendingChannel?, closure: (Void) -> Void) { + if let channel = channel, !channel.closed { let selectCase = FallibleSendingChannelSendErrorCase(channel: channel, error: error, closure: closure) cases.append(selectCase) }