Improve error naming

Swifteroid · Jun 4, 2020 · 59ed29d · 59ed29d
1 parent c8c22cf
commit 59ed29d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/source/Observatory/Observer/Hotkey/Observer.Hotkey.Handler.swift b/source/Observatory/Observer/Hotkey/Observer.Hotkey.Handler.swift
@@ -86,7 +86,7 @@ extension HotkeyObserver {
                 if Int(status) == eventHotKeyExistsErr {
                     throw Error.hotkeyAlreadyRegistered
                 } else if status != Darwin.noErr {
-                    throw Error.hotkeyRegisterFail(status: status)
+                    throw Error.cannotRegisterHotkey(status: status)
                 }
 
                 self.hotkeyIdentifier = identifier
@@ -95,7 +95,7 @@ extension HotkeyObserver {
 
             private func unregisterEventHotkey() throws {
                 let status: OSStatus = UnregisterEventHotKey(self.hotkeyReference)
-                guard status == Darwin.noErr else { throw Error.hotkeyUnregisterFail(status: status) }
+                guard status == Darwin.noErr else { throw Error.cannotUnregisterHotkey(status: status) }
 
                 self.hotkeyIdentifier = nil
                 self.hotkeyReference = nil
@@ -114,7 +114,7 @@ extension HotkeyObserver.Handler.Definition {
 extension HotkeyObserver.Handler.Definition {
     public enum Error: Swift.Error {
         case hotkeyAlreadyRegistered
-        case hotkeyRegisterFail(status: OSStatus)
-        case hotkeyUnregisterFail(status: OSStatus)
+        case cannotRegisterHotkey(status: OSStatus)
+        case cannotUnregisterHotkey(status: OSStatus)
     }
 }
diff --git a/source/Observatory/Observer/Hotkey/Observer.Hotkey.swift b/source/Observatory/Observer/Hotkey/Observer.Hotkey.swift
@@ -112,14 +112,14 @@ open class HotkeyObserver: AbstractObserver {
         // Create universal procedure pointer, so it can be passed to C.
 
         let status: OSStatus = InstallEventHandler(GetApplicationEventTarget(), eventHandler, 1, &eventType, eventHotkeyHandlerPointer, &eventHandlerPointer)
-        guard status == Darwin.noErr else { throw Error.uppInstallFailed }
+        guard status == Darwin.noErr else { throw Error.cannotInstallUPP }
 
         return (eventHandlerPointer!, eventHotkeyHandlerPointer)
     }
 
     private func destructEventHandler(_ eventHandler: EventHandlerPointer, eventHotkeyHandler: EventHotkeyHandlerPointer) throws {
         let status: OSStatus = RemoveEventHandler(eventHandler)
-        guard status == Darwin.noErr else { throw Error.uppRemoveFail }
+        guard status == Darwin.noErr else { throw Error.cannotUninstallUPP }
 
         eventHotkeyHandler.deinitialize(count: 1)
         eventHotkeyHandler.deallocate()
@@ -143,9 +143,9 @@ extension HotkeyObserver {
 extension HotkeyObserver {
     public enum Error: Swift.Error {
         /// Cannot install universal procedure pointer.
-        case uppInstallFailed
+        case cannotInstallUPP
         /// Cannot remove universal procedure pointer.
-        case uppRemoveFail
+        case cannotUninstallUPP
     }
 }