Swift 3.1 compatibility

reactive-swift · Mar 29, 2017 · affe56a · affe56a
1 parent a9e15e2
commit affe56a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Sources/Future/Future.swift b/Sources/Future/Future.swift
@@ -22,8 +22,6 @@ import ExecutionContext
 
 public protocol FutureProtocol : MovableExecutionContextTenantProtocol {
     associatedtype Value
-    //Can not workaround as a protocol, because protocol can't set itself as a requirement
-    typealias SettledTenant = Future<Value>
 
     init(value:Value)
     init(error:Error)

diff --git a/Sources/Future/Signal.swift b/Sources/Future/Signal.swift
@@ -21,7 +21,7 @@ import Result
 import Event
 
 public extension SignalStream {
-    public func flatMap<A, F : FutureProtocol>(_ f:@escaping (Payload)->F) -> SignalStream<Result<A, AnyError>> where F.Value == A {
+    public func flatMap<A, F : FutureProtocol>(_ f:@escaping (Payload)->F) -> SignalStream<Result<A, AnyError>> where F.Value == A, F.SettledTenant == Future<A> {
         let context = self.context
         return SignalStream<Result<A, AnyError>>(context: context, advise: { fun in
             self.chain { sig, payload in