Enable instantiating @MainActor-bound types in Swift 5.10+ #70
Conversation
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
dfed
force-pushed
the
dfed--main-instantiators
branch
from
39fb223 to
b61de26
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #70 +/- ##
==========================================
+ Coverage 99.51% 99.56% +0.04%
==========================================
Files 40 44 +4
Lines 9139 9200 +61
==========================================
+ Hits 9095 9160 +65
+ Misses 44 40 -4
|
dfed
force-pushed
the
dfed--main-instantiators
branch
from
1ef19b3 to
655fa97
Compare
dfed
commented
Apr 7, 2024
| @@ -156,36 +156,6 @@ Property declarations within `@Instantiable` types decorated with [`@Instantiate | |||
|
|
|||
| `@Instantiated`-decorated properties must be an `@Instantiable` type, or of an `additionalType` listed in an `@Instantiable(fulfillingAdditionalTypes:)`‘s declaration. | |||
|
|
|||
| #### Utilizing @Instantiated with type erased properties | |||
There was a problem hiding this comment.
this moved down so that we discuss it after we discuss the Instantiator
dfed
commented
Apr 7, 2024
| @@ -19,34 +19,40 @@ | |||
| // SOFTWARE. | |||
|
|
|||
| /// A SafeDI dependency designed for the deferred instantiation of a type-erased instance of a | |||
| /// type decorated with `@Instantiable`. Instantiation is thread-safe. | |||
There was a problem hiding this comment.
Given that we're explicitly determining threading here it seemed duplicative to say Instantiation is thread-safe.
dfed
commented
Apr 7, 2024
| @@ -1974,7 +1974,7 @@ final class SafeDIToolTests: XCTestCase { | |||
|
|
|||
| extension Root { | |||
| public convenience init() { | |||
| func __safeDI_childABuilder(recreated: Recreated) -> ChildA { | |||
| nonisolated func __safeDI_childABuilder(recreated: Recreated) -> ChildA { | |||
There was a problem hiding this comment.
this part of the code-gen has me pretty convinced that Nonisolated was indeed the correct prefix on the Instantiator
dfed
force-pushed
the
dfed--main-instantiators
branch
2 times, most recently
from
102cb8c to
f53fdb2
Compare
dfed
force-pushed
the
dfed--main-instantiators
branch
from
f53fdb2 to
d1e61c1
Compare
MrAdamBoyd
reviewed
Apr 8, 2024
| @@ -0,0 +1,56 @@ | |||
| // Distributed under the MIT License | |||
There was a problem hiding this comment.
How I wish you could git cp
MrAdamBoyd
reviewed
Apr 8, 2024
| @@ -136,33 +136,48 @@ public struct Property: Codable, Hashable, Comparable, Sendable { | |||
| /// An `Instantiator` property. | |||
| /// The instantiated product is not forwarded down the dependency tree. This is done intentionally to avoid unexpected retains. | |||
| case instantiator | |||
| /// A `ErasedInstantiator` property. | |||
| /// An `ErasedInstantiator` property. | |||
MrAdamBoyd
reviewed
Apr 8, 2024
MrAdamBoyd
approved these changes
Apr 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR makes it possible to use SafeDI with Swift 5.10+ and Strict Concurrency checking turned on. To accomplish this, we made the following changes:
initmethods on@Instantiablebe isolated to the parent actor context – removed thenonisolatedfrom these generatedinitmethods.instantiate(...)method for bothInstantiatorandErasedInstantiatorbecome@MainActor-boundNonisolatedInstantiatorandNonisolatedErasedInstantiator. As the name implies, these instantiators'sinstantiate(...)methods run in a nonisolated context.We made
InstantiatorandErasedInstantiator@MainActor-bound because in most applications the root of the dependency tree is@MainActor-bound, and in applications the majority of delayed-built products are@MainActor-bound. In an effort to make the common case simple, we have optimized for simplifying the@MainActor-bound case.Addresses #65.
This is a breaking change.
To adopt this change locally, consumers will need to follow their build errors after updating to 0.5.0. If something requires instantiation outside of main actor isolation, utilize a
Nonisolated-prefixed Instantiator.