Skip to content

Commit 6ab2125

Browse files
committed
Availability and symbol adjustments
- abandon abi compatibility attempts, since it doesn’t work - adjust visionOS availability
1 parent aa76444 commit 6ab2125

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

Sources/FoundationEssentials/Data/Data.swift

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,8 +2203,7 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
22032203
return try _representation.withUnsafeBytes(body)
22042204
}
22052205

2206-
@abi(var _aeic_bytes: RawSpan)
2207-
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
2206+
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.1, *)
22082207
@_alwaysEmitIntoClient
22092208
public var bytes: RawSpan {
22102209
@lifetime(borrow self)
@@ -2232,13 +2231,7 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
22322231
}
22332232
}
22342233

2235-
@abi(var bytes: RawSpan)
2236-
@available(*, unavailable)
2237-
@usableFromInline
2238-
internal var _abi_compatibility_bytes: RawSpan { bytes }
2239-
2240-
@abi(var _aeic_span: Span<UInt8>)
2241-
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
2234+
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.1, *)
22422235
@_alwaysEmitIntoClient
22432236
public var span: Span<UInt8> {
22442237
@lifetime(borrow self)
@@ -2248,13 +2241,7 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
22482241
}
22492242
}
22502243

2251-
@abi(var span: Span<UInt8>)
2252-
@available(*, unavailable)
2253-
@usableFromInline
2254-
internal var _abi_compatibility_span: Span<UInt8> { span }
2255-
2256-
@abi(var _aeic_mutableBytes: MutableRawSpan)
2257-
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
2244+
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.1, *)
22582245
@_alwaysEmitIntoClient
22592246
public var mutableBytes: MutableRawSpan {
22602247
@lifetime(&self)
@@ -2282,13 +2269,7 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
22822269
}
22832270
}
22842271

2285-
@abi(var mutableBytes: MutableRawSpan)
2286-
@available(*, unavailable)
2287-
@usableFromInline
2288-
internal var _abi_compatibility_mutableBytes: MutableRawSpan { mutating get { mutableBytes } }
2289-
2290-
@abi(var _aeic_mutableSpan: MutableSpan<UInt8>)
2291-
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
2272+
@available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, visionOS 1.1, *)
22922273
@_alwaysEmitIntoClient
22932274
public var mutableSpan: MutableSpan<UInt8> {
22942275
@lifetime(&self)
@@ -2322,11 +2303,6 @@ public struct Data : Equatable, Hashable, RandomAccessCollection, MutableCollect
23222303
}
23232304
}
23242305

2325-
@abi(var mutableSpan: MutableSpan<UInt8>)
2326-
@available(*, unavailable)
2327-
@usableFromInline
2328-
internal var _abi_compatibility_mutableSpan: MutableSpan<UInt8> { mutating get { mutableSpan } }
2329-
23302306
@_alwaysEmitIntoClient
23312307
public func withContiguousStorageIfAvailable<ResultType>(_ body: (_ buffer: UnsafeBufferPointer<UInt8>) throws -> ResultType) rethrows -> ResultType? {
23322308
return try _representation.withUnsafeBytes {

0 commit comments

Comments
 (0)