Refactor MachPortController to use typed throws

Set `swift-tools-version` to `6.0`
Move errors into `MachPortController`

Author: zenangst

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -8,9 +8,7 @@ let package = Package(
     .library(name: "MachPort", targets: ["MachPort"]),
   ],
   targets: [
-    .target(
-      name: "MachPort",
-      dependencies: [])
+    .target(name: "MachPort", dependencies: [])
   ]
 )
 

Sources/MachPort/CFRunLoopSource+Extensions.swift

@@ -1,13 +1,9 @@
 import CoreFoundation
 
-public enum CFRunLoopSourceError: Error {
-  case failedToCreateCFRunLoopSource
-}
-
 internal extension CFRunLoopSource {
-  static func create(with machPort: CFMachPort) throws -> CFRunLoopSource {
+  static func create(with machPort: CFMachPort) throws(MachPortError) -> CFRunLoopSource {
     guard let runLoopSource = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, machPort, 0) else {
-      throw CFRunLoopSourceError.failedToCreateCFRunLoopSource
+      throw .failedToCreateCFRunLoopSource
     }
     return runLoopSource
   }

Sources/MachPort/CGEventSource+Extensions.swift

@@ -1,13 +1,9 @@
 import CoreGraphics
 
-public enum CGEventSourceError: Error {
-  case failedToCreateCGEventSource
-}
-
 internal extension CGEventSource {
-  static func create(_ stateID: CGEventSourceStateID) throws -> CGEventSource {
+  static func create(_ stateID: CGEventSourceStateID) throws(MachPortError) -> CGEventSource {
     guard let eventSource = CGEventSource(stateID: stateID) else {
-      throw CGEventSourceError.failedToCreateCGEventSource
+      throw .failedToCreateCGEventSource
     }
     return eventSource
   }

Sources/MachPort/MachPortError.swift

@@ -2,6 +2,14 @@ import Carbon
 import Cocoa
 import os
 
+public enum MachPortError: Error {
+  case failedToCreateCGEventSource
+  case failedToCreateCFRunLoopSource
+  case failedToCreateMachPort
+  case failedToCreateKeyCode(Int)
+  case failedToCreateEvent
+}
+
 public class MachPortEventPublisher {
   @Published public internal(set) var flagsChanged: CGEventFlags?
   @Published public internal(set) var event: MachPortEvent?
@@ -94,15 +102,15 @@ public final class MachPortEventController: MachPortEventPublisher, @unchecked S
 
   public func createEvent(_ key: Int, type: CGEventType, flags: CGEventFlags,
                           tapLocation: CGEventTapLocation = .cghidEventTap,
-                          configure: (CGEvent) -> Void = { _ in }) throws -> CGEvent {
+                          configure: (CGEvent) -> Void = { _ in }) throws(MachPortError) -> CGEvent {
     guard let cgKeyCode = CGKeyCode(exactly: key) else {
-      throw MachPortError.failedToCreateKeyCode(key)
+      throw .failedToCreateKeyCode(key)
     }
 
     guard let cgEvent = CGEvent(keyboardEventSource: eventSource,
                                 virtualKey: cgKeyCode,
                                 keyDown: type == .keyDown) else {
-      throw MachPortError.failedToCreateEvent
+      throw .failedToCreateEvent
     }
 
     cgEvent.setIntegerValueField(.eventSourceUserData, value: signature)
@@ -207,7 +215,7 @@ public final class MachPortEventController: MachPortEventPublisher, @unchecked S
     return newEvent.result
   }
 
-  private final func createMachPort(_ currentMode: CFRunLoopMode) throws -> CFMachPort {
+  private final func createMachPort(_ currentMode: CFRunLoopMode) throws(MachPortError) -> CFMachPort {
     let userInfo = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque())
 
     guard let machPort = CGEvent.tapCreate(
@@ -230,7 +238,7 @@ public final class MachPortEventController: MachPortEventPublisher, @unchecked S
         }
         return Unmanaged.passUnretained(event)
       }, userInfo: userInfo) else {
-      throw MachPortError.failedToCreateMachPort
+      throw .failedToCreateMachPort
     }
     return machPort
   }