mirror of
https://github.com/apple/swift-collections
synced 2026-11-22 04:20:40 +00:00
Stop using @_addressableForDependencies
This commit is contained in:
8 files changed
+3
-17
No files matched your search
@@ -72,8 +72,6 @@ set(collections_swift_flags
|
||||
"-enable-experimental-feature BuiltinModule"
|
||||
"-enable-experimental-feature Lifetimes"
|
||||
"-enable-experimental-feature InoutLifetimeDependence"
|
||||
"-enable-experimental-feature AddressableParameters"
|
||||
"-enable-experimental-feature AddressableTypes"
|
||||
"-enable-experimental-feature SuppressedAssociatedTypesWithDefaults"
|
||||
)
|
||||
foreach(flag ${collections_swift_flags})
|
||||
|
||||
@@ -113,8 +113,6 @@ let extraSettings: [SwiftSetting] = [
|
||||
.enableExperimentalFeature("BuiltinModule"),
|
||||
.enableExperimentalFeature("Lifetimes"),
|
||||
.enableExperimentalFeature("InoutLifetimeDependence"),
|
||||
.enableExperimentalFeature("AddressableParameters"),
|
||||
.enableExperimentalFeature("AddressableTypes"),
|
||||
.enableExperimentalFeature("SuppressedAssociatedTypesWithDefaults"), // Requires Swift 6.4
|
||||
// Note: if you touch these, please make sure to also update the similar lists in
|
||||
// CMakeLists.txt and Xcode/Shared.xcconfig.
|
||||
|
||||
@@ -113,8 +113,6 @@ let extraSettings: [SwiftSetting] = [
|
||||
.enableExperimentalFeature("BuiltinModule"),
|
||||
.enableExperimentalFeature("Lifetimes"),
|
||||
.enableExperimentalFeature("InoutLifetimeDependence"),
|
||||
.enableExperimentalFeature("AddressableParameters"),
|
||||
.enableExperimentalFeature("AddressableTypes"),
|
||||
// Note: if you touch these, please make sure to also update the similar lists in
|
||||
// CMakeLists.txt and Xcode/Shared.xcconfig.
|
||||
]
|
||||
|
||||
@@ -24,7 +24,7 @@ extension RigidDictionary where Key: ~Copyable, Value: ~Copyable {
|
||||
|
||||
@_alwaysEmitIntoClient
|
||||
@_lifetime(borrow _base)
|
||||
package init(_base: borrowing @_addressable _HTable) {
|
||||
package init(_base: borrowing _HTable) {
|
||||
self._base = Ref(_base)
|
||||
}
|
||||
}
|
||||
@@ -70,10 +70,7 @@ where Key: ~Copyable, Value: ~Copyable
|
||||
|
||||
@_lifetime(borrow self)
|
||||
public func makeBorrowingIterator() -> BorrowingIterator {
|
||||
let bit = self._base.value.makeBucketIterator()
|
||||
// FIXME: This override really should not be necessary. Check if the real `struct Borrow` fixes it.
|
||||
let override = unsafe _overrideLifetime(bit, copying: self)
|
||||
return BorrowingIterator(_it: override)
|
||||
BorrowingIterator(_it: self._base.value.makeBucketIterator())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ public struct RigidDictionary<
|
||||
#else
|
||||
@available(SwiftStdlib 5.0, *)
|
||||
@frozen
|
||||
@_addressableForDependencies
|
||||
@safe
|
||||
public struct RigidDictionary<
|
||||
Key: Hashable & ~Copyable,
|
||||
|
||||
@@ -35,8 +35,7 @@ extension UniqueDictionary where Key: ~Copyable, Value: ~Copyable {
|
||||
public func value(
|
||||
forKey key: borrowing Key
|
||||
) -> Ref<Value>? {
|
||||
// FIXME: Why is this override necessary? Is it sound? It was triggered by RigidDictionary becoming `@_addressableForDependencies`.
|
||||
unsafe _overrideLifetime(_storage.value(forKey: key), borrowing: self)
|
||||
_storage.value(forKey: key)
|
||||
}
|
||||
|
||||
/// Checks if the given key is present in the `RigidDictionary`, and returns
|
||||
|
||||
@@ -25,7 +25,6 @@ public struct UniqueDictionary<
|
||||
#else
|
||||
@available(SwiftStdlib 5.0, *)
|
||||
@frozen
|
||||
@_addressableForDependencies
|
||||
public struct UniqueDictionary<
|
||||
Key: Hashable & ~Copyable,
|
||||
Value: ~Copyable
|
||||
|
||||
@@ -38,8 +38,6 @@ OTHER_SWIFT_FLAGS = $(inherited) \
|
||||
-enable-experimental-feature BuiltinModule \
|
||||
-enable-experimental-feature Lifetimes \
|
||||
-enable-experimental-feature InoutLifetimeDependence \
|
||||
-enable-experimental-feature AddressableParameters \
|
||||
-enable-experimental-feature AddressableTypes \
|
||||
-enable-experimental-feature SuppressedAssociatedTypesWithDefaults \
|
||||
-enable-experimental-feature "AvailabilityMacro=SwiftStdlib 5.0: macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2" \
|
||||
-enable-experimental-feature "AvailabilityMacro=SwiftStdlib 5.1: macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0" \
|
||||
|
||||
Reference in new issue
Block a user