'Cancel' for PromiseKit --

    * Delete CancellableGuarantee and all its usages
    * In PromiseKit Core: instead of using additional functions and methods with the 'CC' suffix, created a new 'cancellable' function to wrap any Promise or Guarantee
    * In the extensions: Rename methods with 'CC' suffix to 'cancellable' prefix (may revisit this)
    * Fix the CancellableCatchable 'recover' methods to properly handle cancellation errors
    * Added an 'afterTask' property to Guarantee, to keep track of the task for calls to 'after'. This way the timer can be appropriately cancelled if the returned Guarantee is passed to the new 'cancellable' function. (may revisit this)
    * Update all cancellable tests for the cancellable API changes

Author: dougzilla32

Sources/MKDirections+Promise.swift

@@ -47,12 +47,12 @@ fileprivate class MKDirectionsTask: CancellableTask {
 
 extension MKDirections {
     /// Begins calculating the requested route information asynchronously.
-    public func calculateCC() -> CancellablePromise<MKDirectionsResponse> {
+    public func cancellableCalculate() -> CancellablePromise<MKDirectionsResponse> {
         return CancellablePromise(task: MKDirectionsTask(self)) { calculate(completionHandler: $0.resolve) }
     }
 
     /// Begins calculating the requested travel-time information asynchronously.
-    public func calculateETACC() -> CancellablePromise<MKETAResponse> {
+    public func cancellableCalculateETA() -> CancellablePromise<MKETAResponse> {
         return CancellablePromise(task: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
     }
 }

Sources/MKMapSnapshotter+Promise.swift

@@ -42,7 +42,7 @@ fileprivate class MKMapSnapshotterTask: CancellableTask {
 
 extension MKMapSnapshotter {
     /// Starts generating the snapshot using the options set in this object.
-    public func startCC() -> CancellablePromise<MKMapSnapshot> {
+    public func cancellableStart() -> CancellablePromise<MKMapSnapshot> {
         return CancellablePromise(task: MKMapSnapshotterTask(self)) { start(completionHandler: $0.resolve) }
     }
 }

Tests/TestMapKit.swift

@@ -77,7 +77,7 @@ extension Test_MKDirections_Swift {
         let rq = MKDirectionsRequest()
         let directions = MockDirections(request: rq)
 
-        directions.calculateCC().done { _ in
+        directions.cancellableCalculate().done { _ in
             XCTFail()
         }.catch(policy: .allErrors) {
             $0.isCancelled ? ex.fulfill() : XCTFail()
@@ -97,7 +97,7 @@ extension Test_MKDirections_Swift {
         }
 
         let rq = MKDirectionsRequest()
-        MockDirections(request: rq).calculateETACC().done { _ in
+        MockDirections(request: rq).cancellableCalculateETA().done { _ in
             XCTFail()
         }.catch(policy: .allErrors) {
             $0.isCancelled ? ex.fulfill() : XCTFail()
@@ -119,7 +119,7 @@ extension Test_MKSnapshotter_Swift {
         }
 
         let snapshotter = MockSnapshotter()
-        snapshotter.startCC().done { _ in
+        snapshotter.cancellableStart().done { _ in
             XCTFail()
         }.catch(policy: .allErrors) {
             $0.isCancelled ? ex.fulfill() : XCTFail()