-
Notifications
You must be signed in to change notification settings - Fork 26
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
stephencelis
merged 6 commits into
pointfreeco:main
from
finestructure:support-typed-throws
Dec 16, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ba86dea
Support typed throws
finestructure dbb8db5
Update Sources/ConcurrencyExtras/Result.swift
finestructure 4708c9f
Constrain change to compiler(>=6)
finestructure fc32317
Also gate the test to Swift 6
finestructure a30dcd5
Include func g in ifdef
finestructure 5904a97
wip
stephencelis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) } | ||
do { | ||
_ = try res.get() | ||
} catch { | ||
XCTAssertEqual(error, SomeError()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Without the change in the
|
||
} | ||
} | ||
|
||
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 | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 aResult<Int, any Error>
back. But at least this way the conversion can be expressed andres
is of typeResult<Int, SomeError>
.