Skip to content

Convert the rethrows to typed throws #4

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.

Sign up for GitHub

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

Merged
mattmassicotte merged 1 commit into from
Jul 31, 2025
Merged

Convert the rethrows to typed throws #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Sources/Lock/AsyncLock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public final class AsyncLock {
state.resumeNextContinuation()
}

public func withLock<T: Sendable>(
public func withLock<T: Sendable, E: Error>(
isolation: isolated (any Actor)? = #isolation,
_ block: @isolated(any) () async throws -> T
) async rethrows -> T {
_ block: @isolated(any) () async throws(E) -> T
) async throws(E) -> T {
await lock()

do {
Expand Down
26 changes: 16 additions & 10 deletions Sources/Lock/AsyncRecursiveLock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ final class AsyncRecursiveLock {
public init() {
}

public func withLock<T: Sendable>(
public func withLock<T: Sendable, E: Error>(
isolation: isolated (any Actor)? = #isolation,
_ block: () async throws -> T
) async rethrows -> T {
_ block: () async throws(E) -> T
) async throws(E) -> T {
let id = ObjectIdentifier(self)
var set = Self.lockedSet

Expand All @@ -23,17 +23,23 @@ final class AsyncRecursiveLock {
return try await block()
}

return try await internalLock.withLock {
try await Self.$lockedSet.withValue(set) {
try await block()
return try await internalLock.withLock { () throws(E) -> T in
do {
return try await Self.$lockedSet.withValue(set) {
try await block()
}
} catch {
/* withValue from TaskLocal does not seem to properly throw typed errors (yet?).
* It does rethrows though, so the forced cast should be valid. */
throw error as! E
}
}
}

// public func withLock<T: Sendable>(
// public func withLock<T: Sendable, E: Error>(
// isolation: isolated (any Actor)? = #isolation,
// _ block: () async throws -> T
// ) async rethrows -> T {
// _ block: () async throws(E) -> T
// ) async throws(E) -> T {
// if Self.locked {
// return try await block()
// }
Expand All @@ -51,7 +57,7 @@ final class AsyncRecursiveLock {
// } catch {
// internalLock.unlock()
//
// throw error
// throw error as! E
// }
// }
}
Loading