Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support typed throws #52

Merged
merged 6 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions Sources/ConcurrencyExtras/Result.swift
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
extension Result where Failure == Swift.Error {
/// Creates a new result by evaluating an async throwing closure, capturing the returned value as
/// a success, or any thrown error as a failure.
///
/// - Parameter body: A throwing closure to evaluate.
@_transparent
public init(catching body: () async throws -> Success) async {
do {
self = .success(try await body())
} catch {
self = .failure(error)
#if compiler(>=6)
extension Result {
/// Creates a new result by evaluating an async throwing closure, capturing the returned value as
/// a success, or any thrown error as a failure.
///
/// - Parameter body: A throwing closure to evaluate.
@_transparent
public init(catching body: () async throws(Failure) -> Success) async {
do {
self = .success(try await body())
} catch {
self = .failure(error)
}
}
}
}
#else
extension Result where Failure == Swift.Error {
@_transparent
public init(catching body: () async throws -> Success) async {
do {
self = .success(try await body())
} catch {
self = .failure(error)
}
}
}
#endif
62 changes: 62 additions & 0 deletions Tests/ConcurrencyExtrasTests/ResultTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import ConcurrencyExtras
import XCTest

final class ResultTests: XCTestCase {
struct SomeError: Error, Equatable { }
func f(_ value: Int) async throws -> Int {
if value == 42 {
return 42
} else {
throw SomeError()
}
}

func testBasics() async {
do {
let res = await Result { try await f(42) }
XCTAssertEqual(try res.get(), 42)
}
do {
let res = await Result { try await f(0) }
do {
_ = try res.get()
} catch let error as SomeError {
XCTAssertEqual(error, SomeError())
} catch {
XCTFail("unexpected error: \(error)")
}
}
}

#if compiler(>=6)
func g(_ value: Int) async throws(SomeError) -> Int {
if value == 42 {
return 42
} else {
throw SomeError()
}
}

func testTypedThrows() async {
let res = await Result { () async throws(SomeError) -> Int in try await g(0) }
Copy link
Contributor Author

@finestructure finestructure Dec 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, this explicit type-pinning of the closure (() async throws(SomeError) -> Int in) is load bearing. Without it, you still get a Result<Int, any Error> back. But at least this way the conversion can be expressed and res is of type Result<Int, SomeError>.

do {
_ = try res.get()
} catch {
XCTAssertEqual(error, SomeError())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the change in the Result extension, this fails to compile with

.../Tests/ConcurrencyExtrasTests/ResultTests.swift:45:24 Cannot convert value of type 'any Error' to expected argument type 'ResultTests.SomeError'

}
}

func h() async throws(SomeError) -> Int {
throw SomeError()
}

func testTypedThrowsInference() async {
let res = await Result(catching: h)
do {
_ = try res.get()
} catch {
XCTAssertEqual(error, SomeError())
}
}
#endif
}
Loading