Merge pull request #5 from koher/dev-3.1

Support Swift 4.1
koher · Apr 2, 2018 · 72bea2c · 72bea2c
2 parents 3d6d5bf + 3cb2984
commit 72bea2c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/PromiseK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PromiseK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Sources/PromiseK/Throws.swift b/Sources/PromiseK/Throws.swift
@@ -10,8 +10,16 @@ extension Promise {
         }
     }
 
+    private func _flatMap<T>(_ transform: @escaping (Value) -> Promise<T>) -> Promise<T> {
+        return flatMap(transform)
+    }
+
+    public func flatMap<T>(_ transform: @escaping (Value) -> Promise<() throws -> T>) -> Promise<() throws -> T> {
+        return _flatMap(transform)
+    }
+
     public func flatMap<T>(_ transform: @escaping (Value) throws -> Promise<T>) -> Promise<() throws -> T> {
-        return flatMap { value in
+        return _flatMap { value in
             do {
                 return try transform(value).map { value in { value } }
             } catch let error {
@@ -21,7 +29,7 @@ extension Promise {
     }
 
     public func flatMap<T>(_ transform: @escaping (Value) throws -> Promise<() throws -> T>) -> Promise<() throws -> T> {
-        return flatMap { value in
+        return _flatMap { value in
             do {
                 return try transform(value)
             } catch let error {