Rename run(_:throwing:) to run(_:rethrowing), bundle with run(_:defer:)

Author: finestructure

Sources/App/Commands/Ingest.swift

@@ -185,7 +185,7 @@ extension Ingestion {
 
             try await run { () async throws(Ingestion.Error.UnderlyingError) in
                 try await updateRepository(on: database, for: repo, metadata: metadata, licenseInfo: license, readmeInfo: readme, s3Readme: s3Readme, fork: fork)
-            } throwing: {
+            } rethrowing: {
                 Ingestion.Error(packageId: package.model.id!, underlyingError: $0)
             }
             return package
@@ -209,7 +209,7 @@ extension Ingestion {
     static func findOrCreateRepository(on database: Database, for package: Joined<Package, Repository>) async throws(Ingestion.Error) -> Repository {
         try await run {
             try await Repository.findOrCreate(on: database, for: package.model)
-        } throwing: {
+        } rethrowing: {
             Ingestion.Error(
                 packageId: package.model.id!,
                 underlyingError: .findOrCreateRepositoryFailed(url: package.model.url, details: $0)
@@ -241,7 +241,7 @@ func fetchMetadata(client: Client, package: Joined<Package, Repository>) async t
     // The only way to get `owner` and `repository` here is by parsing them from the URL.
     let (owner, repository) = try await run {
         try Github.parseOwnerName(url: package.model.url)
-    } throwing: { _ in
+    } rethrowing: { _ in
         Ingestion.Error.invalidURL(packageId: package.model.id!, url: package.model.url)
     }
 

Sources/App/Core/AsyncDefer.swift renamed to Sources/App/Core/ErrorHandlingHelpers.swift

@@ -15,7 +15,7 @@
 
 @discardableResult
 func run<T>(_ operation: () async throws -> T,
-         defer deferredOperation: () async throws -> Void) async throws -> T {
+            defer deferredOperation: () async throws -> Void) async throws -> T {
     do {
         let result = try await operation()
         try await deferredOperation()
@@ -25,3 +25,15 @@ func run<T>(_ operation: () async throws -> T,
         throw error
     }
 }
+
+
+@discardableResult
+func run<T, E1: Error, E2: Error>(_ operation: () async throws(E1) -> T,
+                                  rethrowing transform: (E1) -> E2) async throws(E2) -> T {
+    do {
+        let result = try await operation()
+        return result
+    } catch {
+        throw transform(error)
+    }
+}

Sources/App/Core/Extensions/Result+ext.swift

@@ -25,17 +25,3 @@ extension Result where Failure == Error {
 
     var isError: Bool { return !isSucess }
 }
-
-
-// Not really a part of the Result type but closely enough related to put here
-// Perhaps put this in AsyncDefer.swift and rename the file?
-@discardableResult
-func run<T, E1: Error, E2: Error>(_ operation: () async throws(E1) -> T,
-                                  throwing transform: (E1) -> E2) async throws(E2) -> T {
-    do {
-        let result = try await operation()
-        return result
-    } catch {
-        throw transform(error)
-    }
-}