Rename try() to retry()

Author: inamiy

SwiftTask/SwiftTask.swift

@@ -311,17 +311,17 @@ public class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
         return clonedTask
     }
 
-    /// Returns new task that is retryable for `maxTryCount-1` times.
-    public func `try`(maxTryCount: Int) -> Task
+    /// Returns new task that is retryable for `maxRetryCount (= maxTryCount-1)` times.
+    public func retry(maxRetryCount: Int) -> Task
     {
-        if maxTryCount < 2 { return self }
+        if maxRetryCount < 1 { return self }
 
         return Task { machine, progress, fulfill, _reject, configure in
 
             let task = self.progress { _, progressValue in
                 progress(progressValue)
             }.failure { [unowned self] _ -> Task in
-                return self.clone().`try`(maxTryCount-1) // clone & try recursively
+                return self.clone().retry(maxRetryCount-1) // clone & try recursively
             }
 
             task.progress { _, progressValue in
@@ -345,7 +345,7 @@ public class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
                 self.cancel()
             }
 
-        }.name("\(self.name)-try(\(maxTryCount))")
+        }.name("\(self.name)-try(\(maxRetryCount))")
     }
 
     ///
@@ -790,18 +790,4 @@ extension Task
             task.resume()
         }
     }
-}
-
-//--------------------------------------------------
-// MARK: - Custom Operators
-// + - * / % = < > ! & | ^ ~ .
-//--------------------------------------------------
-
-infix operator ~ { associativity left }
-
-/// abbreviation for `try()`
-/// e.g. (task ~ 3).then { ... }
-public func ~ <P, V, E>(task: Task<P, V, E>, tryCount: Int) -> Task<P, V, E>
-{
-    return task.`try`(tryCount)
 }

SwiftTaskTests/SwiftTaskTests.swift

@@ -791,9 +791,9 @@ class SwiftTaskTests: _TestCase
                 }
             }
 
-        }.`try`(maxTryCount).failure { errorInfo -> String in
+        }.retry(maxTryCount-1).failure { errorInfo -> String in
 
-            XCTFail("Should never reach here because `task.retry(\(maxTryCount))` will be fulfilled on retry[\(fulfilledTryCount)] even though retry[1...\(fulfilledTryCount-1)] will be rejected.")
+            XCTFail("Should never reach here because `task.retry(\(maxTryCount-1))` will be fulfilled at `fulfilledTryCount` try even though previous retries will be rejected.")
 
             return "DUMMY"
 
@@ -825,7 +825,7 @@ class SwiftTaskTests: _TestCase
                 reject("ERROR \(actualTryCount)")
             }
 
-        }.`try`(maxTryCount).failure { error, isCancelled -> String in
+        }.retry(maxTryCount-1).failure { error, isCancelled -> String in
 
             XCTAssertEqual(error!, "ERROR \(actualTryCount)")
             XCTAssertFalse(isCancelled)
@@ -867,7 +867,7 @@ class SwiftTaskTests: _TestCase
                 }
             }
 
-        }.`try`(maxTryCount).progress { _ in
+        }.retry(maxTryCount-1).progress { _ in
 
             progressCount++
 
@@ -927,7 +927,7 @@ class SwiftTaskTests: _TestCase
                 return
             }
 
-        }.`try`(maxTryCount)
+        }.retry(maxTryCount-1)
 
         retryableTask.success { value -> Void in
 
@@ -979,7 +979,7 @@ class SwiftTaskTests: _TestCase
 
         }
 
-        let retryableTask = task.`try`(maxTryCount)
+        let retryableTask = task.retry(maxTryCount-1)
 
         retryableTask.success { value -> Void in