Don’t accidentally trump Swift.Error during usage

Refs mxcl/PromiseKit#553

Author: mxcl

Sources/UIImagePickerController+Promise.swift

@@ -30,7 +30,7 @@ extension UIViewController {
             if let img = info[UIImagePickerControllerOriginalImage] as? UIImage {
                 return img
             }
-            throw Error.noImageFound
+            throw PMKError.noImageFound
         }.always {
             vc.presentingViewController?.dismiss(animated: animated, completion: nil)
         }
@@ -63,14 +63,14 @@ extension UIViewController {
     }
 
     func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
-        reject(UIImagePickerController.Error.cancelled)
+        reject(UIImagePickerController.PMKError.cancelled)
         retainCycle = nil
     }
 }
 
 extension UIImagePickerController {
     /// Errors representing PromiseKit UIImagePickerController failures
-    public enum Error: CancellableError {
+    public enum PMKError: CancellableError {
         /// The user cancelled the UIImagePickerController.
         case cancelled
         /// - Returns: true

Sources/UIViewController+Promise.swift

@@ -21,7 +21,7 @@ import PromiseKit
 */
 extension UIViewController {
 
-    public enum Error: Swift.Error {
+    public enum PMKError: Error {
         case navigationControllerEmpty
         case noImageFound
         case notPromisable
@@ -43,7 +43,7 @@ extension UIViewController {
 
         switch vc {
         case let nc as UINavigationController:
-            guard let vc = nc.viewControllers.first else { return Promise(error: Error.navigationControllerEmpty) }
+            guard let vc = nc.viewControllers.first else { return Promise(error: PMKError.navigationControllerEmpty) }
             pvc = vc
         default:
             pvc = vc
@@ -52,13 +52,13 @@ extension UIViewController {
         let promise: Promise<T>
 
         if !(pvc is Promisable) {
-            promise = Promise(error: Error.notPromisable)
+            promise = Promise(error: PMKError.notPromisable)
         } else if let p = pvc.value(forKeyPath: "promise") as? Promise<T> {
             promise = p
         } else if let _ = pvc.value(forKeyPath: "promise") {
-            promise = Promise(error: Error.notGenericallyPromisable)
+            promise = Promise(error: PMKError.notGenericallyPromisable)
         } else {
-            promise = Promise(error: Error.nilPromisable)
+            promise = Promise(error: PMKError.nilPromisable)
         }
 
         if !promise.isPending {

Tests/TestUIViewController.swift

@@ -12,7 +12,7 @@ class UIViewControllerTests: XCTestCase {
         let ex = expectation(description: "")
         let p: Promise<Int> = rootvc.promise(UIViewController(), animate: [])
         p.catch { error in
-            if case UIViewController.Error.notPromisable = error {
+            if case UIViewController.PMKError.notPromisable = error {
                 ex.fulfill()
             }
         }
@@ -23,7 +23,7 @@ class UIViewControllerTests: XCTestCase {
         let ex = expectation(description: "")
         let p: Promise<Int> = rootvc.promise(MockViewController(), animate: [])
         p.catch { error in
-            if case UIViewController.Error.nilPromisable = error {
+            if case UIViewController.PMKError.nilPromisable = error {
                 ex.fulfill()
             }
         }
@@ -36,7 +36,7 @@ class UIViewControllerTests: XCTestCase {
         my.promise = Promise(value: true)
         let p: Promise<Int> = rootvc.promise(my, animate: [])
         p.catch { err in
-            if case UIViewController.Error.notGenericallyPromisable = err {
+            if case UIViewController.PMKError.notGenericallyPromisable = err {
                 ex.fulfill()
             }
         }