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

Address @Shared sendability. #3329

Merged
merged 16 commits into from
Sep 6, 2024
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into shared-sendability
  • Loading branch information
mbrandonw committed Sep 6, 2024
commit 002036553e5d67b5cefddbd11711af1d35303ca9
6 changes: 4 additions & 2 deletions Sources/ComposableArchitecture/Effects/Cancellation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ extension Effect {
) async rethrows -> T {
@Dependency(\.navigationIDPath) var navigationIDPath

let (cancellable, task): (AnyCancellable, Task<T, Error>) = _cancellationCancellables
let (cancellable, task): (AnyCancellable, Task<T, Error>) =
_cancellationCancellables
.withValue {
if cancelInFlight {
$0.cancel(id: id, path: navigationIDPath)
Expand Down Expand Up @@ -202,7 +203,8 @@ extension Effect {
) async rethrows -> T {
@Dependency(\.navigationIDPath) var navigationIDPath

let (cancellable, task): (AnyCancellable, Task<T, Error>) = _cancellationCancellables
let (cancellable, task): (AnyCancellable, Task<T, Error>) =
_cancellationCancellables
.withValue {
if cancelInFlight {
$0.cancel(id: id, path: navigationIDPath)
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.