Skip to content

Commit 7fb76c9

Browse files
committed
Update for SE-0193
- @_inlineable => @inlinable - @_versioned => @usableFromInline - @inlinable @usableFromInline => @inlinable
1 parent 95905cf commit 7fb76c9

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

Foundation/Boxing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
///
1515
/// Note: This assumes that the result of calling copy() is mutable. The documentation says that classes which do not have a mutable/immutable distinction should just adopt NSCopying instead of NSMutableCopying.
1616
internal final class _MutableHandle<MutableType : NSObject> where MutableType : NSCopying {
17-
@_versioned internal var _pointer : MutableType
17+
@usableFromInline internal var _pointer : MutableType
1818

1919
init(reference : MutableType) {
2020
_pointer = reference.copy() as! MutableType

Foundation/Data.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -993,8 +993,8 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
993993
public typealias Index = Int
994994
public typealias Indices = Range<Int>
995995

996-
@_versioned internal var _backing : _DataStorage
997-
@_versioned internal var _sliceRange: Range<Index>
996+
@usableFromInline internal var _backing : _DataStorage
997+
@usableFromInline internal var _sliceRange: Range<Index>
998998

999999

10001000
// A standard or custom deallocator for `Data`.
@@ -1245,18 +1245,18 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
12451245
}
12461246
}
12471247

1248-
@_versioned
1248+
@usableFromInline
12491249
internal init(backing: _DataStorage, range: Range<Index>) {
12501250
_backing = backing
12511251
_sliceRange = range
12521252
}
12531253

1254-
@_versioned
1254+
@usableFromInline
12551255
internal func _validateIndex(_ index: Int, message: String? = nil) {
12561256
precondition(_sliceRange.contains(index), message ?? "Index \(index) is out of bounds of range \(_sliceRange)")
12571257
}
12581258

1259-
@_versioned
1259+
@usableFromInline
12601260
internal func _validateRange<R: RangeExpression>(_ range: R) where R.Bound == Int {
12611261
let lower = R.Bound(_sliceRange.lowerBound)
12621262
let upper = R.Bound(_sliceRange.upperBound)

Foundation/IndexSet.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio
150150
public typealias ReferenceType = NSIndexSet
151151
public typealias Element = Int
152152

153-
@_versioned
153+
@usableFromInline
154154
internal var _handle: _MutablePairHandle<NSIndexSet, NSMutableIndexSet>
155155

156156
/// Initialize an `IndexSet` with a range of integers.
@@ -846,7 +846,7 @@ internal enum _MutablePair<ImmutableType, MutableType> {
846846
/// a.k.a. Box
847847
internal final class _MutablePairHandle<ImmutableType : NSObject, MutableType : NSObject>
848848
where ImmutableType : NSMutableCopying, MutableType : NSMutableCopying {
849-
@_versioned
849+
@usableFromInline
850850
internal var _pointer: _MutablePair<ImmutableType, MutableType>
851851

852852
/// Initialize with an immutable reference instance.

Foundation/NSStringAPI.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,7 @@ extension StringProtocol where Index == String.Index {
435435

436436
// self can be a Substring so we need to subtract/add this offset when
437437
// passing _ns to the Foundation APIs. Will be 0 if self is String.
438-
@_inlineable
439-
@_versioned
438+
@inlinable
440439
internal var _substringOffset: Int {
441440
return self.startIndex.encodedOffset
442441
}
@@ -447,8 +446,7 @@ extension StringProtocol where Index == String.Index {
447446
return Index(encodedOffset: utf16Index + _substringOffset)
448447
}
449448

450-
@_inlineable
451-
@_versioned
449+
@inlinable
452450
internal func _toRelativeNSRange(_ r: Range<String.Index>) -> NSRange {
453451
return NSRange(
454452
location: r.lowerBound.encodedOffset - _substringOffset,

Foundation/NSSwiftRuntime.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ internal func _CFZeroUnsafeIvars<T>(_ arg: inout T) {
140140
}
141141
}
142142

143-
@_versioned
143+
@usableFromInline
144144
@_cdecl("__CFSwiftGetBaseClass")
145145
internal func __CFSwiftGetBaseClass() -> UnsafeRawPointer {
146146
return unsafeBitCast(__NSCFType.self, to:UnsafeRawPointer.self)
147147
}
148148

149-
@_versioned
149+
@usableFromInline
150150
@_cdecl("__CFInitializeSwift")
151151
internal func __CFInitializeSwift() {
152152

0 commit comments

Comments
 (0)