Skip to content

Relax sendability / improve default main actor isolation compatibility #321

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

Draft
stephencelis wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Relax sendability / improve default main actor isolation compatibility #321

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
2 changes: 1 addition & 1 deletion Examples/CaseStudies/UIKit/WiFiFeature/Network.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation

struct Network: Identifiable, Hashable {
nonisolated struct Network: Identifiable, Hashable {
let id = UUID()
var name = ""
var isSecured = true
Expand Down
4 changes: 2 additions & 2 deletions Examples/CaseStudies/UIKit/WiFiFeature/WiFiSettingsFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,14 @@ class WiFiSettingsViewController: UICollectionViewController, UIKitCaseStudy {
model.networkTapped(network)
}

enum Section: Hashable, Sendable {
nonisolated enum Section: Hashable, Sendable {
case top
case foundNetworks
}

@CasePathable
@dynamicMemberLookup
enum Item: Hashable, Sendable {
nonisolated enum Item: Hashable, Sendable {
case isOn
case selectedNetwork(Network.ID)
case foundNetwork(Network)
Expand Down
2 changes: 2 additions & 0 deletions Examples/Examples.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 6.0;
Expand Down Expand Up @@ -685,6 +686,7 @@
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 6.0;
Expand Down
6 changes: 3 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.6"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", branch: "relax-sendable"),
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
.package(url: "https://github.com/pointfreeco/swift-perception", "1.3.4"..<"3.0.0"),
Expand Down
35 changes: 0 additions & 35 deletions Sources/SwiftNavigation/Internal/KeyPath+Sendable.swift
View file
Open in desktop

This file was deleted.

47 changes: 23 additions & 24 deletions Sources/SwiftNavigation/UIBinding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import IssueReporting
/// When `PlayerViewController` initializes `PlayButton`, it passes a binding of its `isPlaying`
/// state along. Applying the `$` prefix to a property wrapped value returns its ``projectedValue``,
/// which returns a binding to the value. Whenever the user taps the `PlayButton`, the
/// `PlayerViewController` updates its `isPlaying` state.
/// `PlayerViewController` updates its `isPlaying` state.
///
/// > Note: To create bindings to properties of a type that conforms to the `Observable` or
/// > `Perceptible` protocols, use the [`@UIBindable`](<doc:UIBindable>) property wrapper.
Expand Down Expand Up @@ -134,7 +134,7 @@ import IssueReporting
/// ```
@dynamicMemberLookup
@propertyWrapper
public struct UIBinding<Value>: Sendable {
public struct UIBinding<Value> {
fileprivate let location: any _UIBinding<Value>

/// The binding's transaction.
Expand Down Expand Up @@ -400,7 +400,7 @@ public struct UIBinding<Value>: Sendable {
) -> UIBinding<Member> {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member> {
UIBinding<Member>(
location: _UIBindingAppendKeyPath(base: location, keyPath: keyPath.unsafeSendable()),
location: _UIBindingAppendKeyPath(base: location, keyPath: keyPath),
transaction: transaction
)
}
Expand All @@ -418,7 +418,7 @@ public struct UIBinding<Value>: Sendable {
where Value: CasePathable {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member?> {
UIBinding<Member?>(
location: _UIBindingEnumToOptionalCase(base: location, keyPath: keyPath.unsafeSendable()),
location: _UIBindingEnumToOptionalCase(base: location, keyPath: keyPath),
transaction: transaction
)
}
Expand All @@ -435,7 +435,7 @@ public struct UIBinding<Value>: Sendable {
where Value == Wrapped? {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member?> {
UIBinding<Member?>(
location: _UIBindingOptionalToMember(base: location, keyPath: keyPath.unsafeSendable()),
location: _UIBindingOptionalToMember(base: location, keyPath: keyPath),
transaction: transaction
)
}
Expand All @@ -452,7 +452,7 @@ public struct UIBinding<Value>: Sendable {
where Value == V? {
func open(_ location: some _UIBinding<Value>) -> UIBinding<Member?> {
UIBinding<Member?>(
location: _UIBindingOptionalEnumToCase(base: location, keyPath: keyPath.unsafeSendable()),
location: _UIBindingOptionalEnumToCase(base: location, keyPath: keyPath),
transaction: transaction
)
}
Expand Down Expand Up @@ -506,24 +506,26 @@ extension UIBinding: Identifiable where Value: Identifiable {
}
}

extension UIBinding: @unchecked Sendable where Value: Sendable {}

/// A unique identifier for a binding.
public struct UIBindingIdentifier: Hashable, Sendable {
private let location: AnyHashableSendable
public struct UIBindingIdentifier: Hashable {
private let location: AnyHashable

/// Creates an instance that uniquely identifies the given binding.
///
/// - Parameter binding: An instance of a binding.
public init<Value>(_ binding: UIBinding<Value>) {
self.location = AnyHashableSendable(binding.location)
self.location = AnyHashable(binding.location)
}
}

protocol _UIBinding<Value>: AnyObject, Hashable, Sendable {
protocol _UIBinding<Value>: AnyObject, Hashable {
associatedtype Value
var wrappedValue: Value { get set }
}

private final class _UIBindingStrongRoot<Root: AnyObject>: _UIBinding, @unchecked Sendable {
private final class _UIBindingStrongRoot<Root: AnyObject>: _UIBinding {
init(root: Root) {
self.wrappedValue = root
}
Expand Down Expand Up @@ -644,10 +646,10 @@ private final class _UIBindingConstant<Value>: _UIBinding, @unchecked Sendable {
}
}

private final class _UIBindingAppendKeyPath<Base: _UIBinding, Value>: _UIBinding, Sendable {
private final class _UIBindingAppendKeyPath<Base: _UIBinding, Value>: _UIBinding {
let base: Base
let keyPath: _SendableWritableKeyPath<Base.Value, Value>
init(base: Base, keyPath: _SendableWritableKeyPath<Base.Value, Value>) {
let keyPath: WritableKeyPath<Base.Value, Value>
init(base: Base, keyPath: WritableKeyPath<Base.Value, Value>) {
self.base = base
self.keyPath = keyPath
}
Expand All @@ -664,10 +666,7 @@ private final class _UIBindingAppendKeyPath<Base: _UIBinding, Value>: _UIBinding
}
}

private final class _UIBindingFromOptional<Base: _UIBinding<Value?>, Value>: _UIBinding,
@unchecked
Sendable
{
private final class _UIBindingFromOptional<Base: _UIBinding<Value?>, Value>: _UIBinding {
var value: Value
let base: Base
init(initialValue: Value, base: Base) {
Expand Down Expand Up @@ -739,10 +738,10 @@ where Base.Value: Hashable {
private final class _UIBindingEnumToOptionalCase<Base: _UIBinding, Case>: _UIBinding
where Base.Value: CasePathable {
let base: Base
let keyPath: _SendableKeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
let keyPath: KeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
let casePath: AnyCasePath<Base.Value, Case>
init(
base: Base, keyPath: _SendableKeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
base: Base, keyPath: KeyPath<Base.Value.AllCasePaths, AnyCasePath<Base.Value, Case>>
) {
self.base = base
self.keyPath = keyPath
Expand Down Expand Up @@ -822,8 +821,8 @@ private final class _UIBindingOptionalToMember<
Base: _UIBinding<Wrapped?>, Wrapped, Value
>: _UIBinding {
let base: Base
let keyPath: _SendableWritableKeyPath<Wrapped, Value>
init(base: Base, keyPath: _SendableWritableKeyPath<Wrapped, Value>) {
let keyPath: WritableKeyPath<Wrapped, Value>
init(base: Base, keyPath: WritableKeyPath<Wrapped, Value>) {
self.base = base
self.keyPath = keyPath
}
Expand Down Expand Up @@ -852,9 +851,9 @@ private final class _UIBindingOptionalEnumToCase<
Base: _UIBinding<Enum?>, Enum: CasePathable, Case
>: _UIBinding {
let base: Base
let keyPath: _SendableKeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>
let keyPath: KeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>
let casePath: AnyCasePath<Enum, Case>
init(base: Base, keyPath: _SendableKeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>) {
init(base: Base, keyPath: KeyPath<Enum.AllCasePaths, AnyCasePath<Enum, Case>>) {
self.base = base
self.keyPath = keyPath
self.casePath = Enum.allCasePaths[keyPath: keyPath]
Expand Down
7 changes: 4 additions & 3 deletions SwiftNavigation.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.