[stdlib] Eradicate IndexDistance associated type (#12641)
* Eradicate IndexDistance associated type, replacing with Int everywhere
* Consistently use Int for ExistentialCollection’s IndexDistance type.
* Fix test for IndexDistance removal
* Remove a handful of no-longer-needed explicit types
* Add compatibility shims for non-Int index distances
* Test compatibility shim
* Move IndexDistance typealias into the Collection protocol
diff --git a/benchmark/single-source/StaticArray.swift b/benchmark/single-source/StaticArray.swift
index 7821f7e..27e392f 100644
--- a/benchmark/single-source/StaticArray.swift
+++ b/benchmark/single-source/StaticArray.swift
@@ -58,7 +58,6 @@
func count() -> Int { return values.count() }
typealias Index = Int
- typealias IndexDistance = Int
let startIndex: Int = 0
var endIndex: Int { return count()}
diff --git a/stdlib/private/StdlibCollectionUnittest/CheckCollectionInstance.swift.gyb b/stdlib/private/StdlibCollectionUnittest/CheckCollectionInstance.swift.gyb
index f30f439..008c400 100644
--- a/stdlib/private/StdlibCollectionUnittest/CheckCollectionInstance.swift.gyb
+++ b/stdlib/private/StdlibCollectionUnittest/CheckCollectionInstance.swift.gyb
@@ -56,11 +56,11 @@
_ instances: Instances,
of baseCollection: BaseCollection,
equalityOracle: (Instances.Index, Instances.Index) -> Bool,
- ${end}Index: Instances.Iterator.Element, ${TRACE}
+ ${end}Index: Instances.Element, ${TRACE}
) where
Instances : Collection,
BaseCollection : ${protocol},
- Instances.Iterator.Element == BaseCollection.Index {
+ Instances.Element == BaseCollection.Index {
checkEquatable(instances, oracle: equalityOracle, ${trace})
for i in instances {
@@ -82,20 +82,20 @@
_ instances: Instances,
of baseCollection : BaseCollection,
equalityOracle: (Instances.Index, Instances.Index) -> Bool,
- limit: Instances.Iterator.Element,
- sign: BaseCollection.IndexDistance, // 1 or -1
- next: (Instances.Iterator.Element) -> Instances.Iterator.Element,
+ limit: Instances.Element,
+ sign: Int, // 1 or -1
+ next: (Instances.Element) -> Instances.Element,
${TRACE}
) where
Instances : Collection,
BaseCollection : Collection,
- Instances.Iterator.Element == BaseCollection.Index {
+ Instances.Element == BaseCollection.Index {
for i in instances {
- let d: BaseCollection.IndexDistance = sign > 0 ?
+ let d: Int = sign > 0 ?
baseCollection.distance(from: i, to: limit) :
-baseCollection.distance(from: limit, to: i)
- var offset: BaseCollection.IndexDistance = 0
+ var offset: Int = 0
for _ in 0...Int64(d * sign) {
let j = baseCollection.index(i, offsetBy: offset)
let k = baseCollection.index(i, offsetBy: offset + sign, limitedBy: limit) ?? limit
@@ -119,11 +119,11 @@
_ instances: Instances,
of baseCollection: BaseCollection,
equalityOracle: (Instances.Index, Instances.Index) -> Bool,
- endIndex: Instances.Iterator.Element, ${TRACE}
+ endIndex: Instances.Element, ${TRACE}
) where
Instances : Collection,
BaseCollection : Collection,
- Instances.Iterator.Element == BaseCollection.Index {
+ Instances.Element == BaseCollection.Index {
checkIncrementable(instances, of: baseCollection,
equalityOracle: equalityOracle, endIndex: endIndex, ${trace})
@@ -144,13 +144,13 @@
_ instances: Instances,
of baseCollection: BaseCollection,
equalityOracle: (Instances.Index, Instances.Index) -> Bool,
- startIndex: Instances.Iterator.Element,
- endIndex: Instances.Iterator.Element,
+ startIndex: Instances.Element,
+ endIndex: Instances.Element,
${TRACE}
) where
Instances: Collection,
BaseCollection : BidirectionalCollection,
- Instances.Iterator.Element == BaseCollection.Index {
+ Instances.Element == BaseCollection.Index {
checkForwardIndex(instances, of: baseCollection,
equalityOracle: equalityOracle, endIndex: endIndex)
@@ -176,9 +176,9 @@
_ instances: Instances, distances: Distances,
of baseCollection: BaseCollection,
distanceOracle:
- (Instances.Index, Instances.Index) -> Distances.Iterator.Element,
+ (Instances.Index, Instances.Index) -> Distances.Element,
advanceOracle:
- (Instances.Index, Distances.Index) -> Instances.Iterator.Element,
+ (Instances.Index, Distances.Index) -> Instances.Element,
startIndex: Instances.Iterator.Element,
endIndex: Instances.Iterator.Element,
${TRACE}
@@ -186,8 +186,8 @@
Instances : Collection,
Distances : Collection,
BaseCollection : RandomAccessCollection,
- Instances.Iterator.Element == BaseCollection.Index,
- Distances.Iterator.Element == BaseCollection.IndexDistance {
+ Instances.Element == BaseCollection.Index,
+ Distances.Element == Int {
checkBidirectionalIndex(instances, of: baseCollection,
equalityOracle: { distanceOracle($0, $1) == 0 },
@@ -207,16 +207,16 @@
_ instances: Instances, distances: Distances,
of baseCollection: BaseCollection,
distanceOracle:
- (Instances.Index, Instances.Index) -> Distances.Iterator.Element,
+ (Instances.Index, Instances.Index) -> Distances.Element,
advanceOracle:
- (Instances.Index, Distances.Index) -> Instances.Iterator.Element,
+ (Instances.Index, Distances.Index) -> Instances.Element,
${TRACE}
) where
Instances : Collection,
Distances : Collection,
BaseCollection : Collection,
- Instances.Iterator.Element == BaseCollection.Index,
- Distances.Iterator.Element == BaseCollection.IndexDistance {
+ Instances.Element == BaseCollection.Index,
+ Distances.Element == Int {
checkComparable(
instances,
@@ -246,7 +246,7 @@
// picked up when the caller passes a literal), and another that
// accepts any appropriate Collection type.
% for genericParam, Element, Expected in [
-% ('Expected: Collection', 'Expected.Iterator.Element', 'Expected'),
+% ('Expected: Collection', 'Expected.Element', 'Expected'),
% ('Element' , 'Element' , 'Array<Element>')]:
// Top-level check for Collection instances. Alias for checkForwardCollection.
@@ -257,7 +257,7 @@
${TRACE},
resiliencyChecks: CollectionMisuseResiliencyChecks = .all,
sameValue: (${Element}, ${Element}) -> Bool
-) where C.Iterator.Element == ${Element} {
+) where C.Element == ${Element} {
checkForwardCollection(expected, collection, message(),
stackTrace: stackTrace, showFrame: showFrame, file: file, line: line,
@@ -276,7 +276,7 @@
${TRACE},
resiliencyChecks: CollectionMisuseResiliencyChecks = .all
) where
- C.Iterator.Element == ${Element},
+ C.Element == ${Element},
${Element} : Equatable {
check${Traversal}Collection(
@@ -296,7 +296,7 @@
resiliencyChecks: CollectionMisuseResiliencyChecks = .all,
sameValue: (${Element}, ${Element}) -> Bool
) where
- C.Iterator.Element == ${Element} {
+ C.Element == ${Element} {
checkOneLevelOf${Traversal}Collection(expected, collection, ${trace},
resiliencyChecks: resiliencyChecks, sameValue: sameValue)
@@ -324,7 +324,7 @@
${TRACE},
resiliencyChecks: CollectionMisuseResiliencyChecks = .all,
sameValue: (${Element}, ${Element}) -> Bool
-) where C.Iterator.Element == ${Element} {
+) where C.Element == ${Element} {
// A `Collection` is a multi-pass `Sequence`.
for _ in 0..<3 {
@@ -370,7 +370,7 @@
% else:
% assert(Traversal == 'RandomAccess')
- typealias Distance = C.IndexDistance
+ typealias Distance = Int
let count: Distance = collection.count
let offset0 = min(5, count)
@@ -501,7 +501,7 @@
resiliencyChecks: CollectionMisuseResiliencyChecks = .all,
sameValue: (${Element}, ${Element}) -> Bool
) where
- S.Iterator.Element == ${Element} {
+ S.Element == ${Element} {
let expectedArray = Array(expected)
@@ -564,14 +564,14 @@
) where
C : RangeReplaceableCollection,
N : Collection,
- C.Iterator.Element : Equatable,
- C.Iterator.Element == N.Iterator.Element {
+ C.Element : Equatable,
+ C.Element == N.Element {
typealias A = C
// First make an independent copy of the array that we can use for
// comparison later.
- let source = Array<A.Iterator.Element>(makeCollection())
+ let source = Array<A.Element>(makeCollection())
for (ix, i) in source.indices.enumerated() {
for (jx_, j) in (i..<source.endIndex).enumerated() {
diff --git a/stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift.gyb b/stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift.gyb
index 9db5c1f..7e597d6 100644
--- a/stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift.gyb
+++ b/stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift.gyb
@@ -1198,10 +1198,10 @@
// FIXME: swift-3-indexing-model -
// enhance the following for negative direction?
- // advance(i: Index, by n: IndexDistance) -> Index
+ // advance(i: Index, by n: Int) -> Index
// advance(
- // i: Index, by n: IndexDistance, limitedBy: Index) -> Index
- // distance(from start: Index, to end: Index) -> IndexDistance
+ // i: Index, by n: Int, limitedBy: Index) -> Index
+ // distance(from start: Index, to end: Index) -> Int
//===------------------------------------------------------------------===//
// last
diff --git a/stdlib/private/StdlibCollectionUnittest/LoggingWrappers.swift.gyb b/stdlib/private/StdlibCollectionUnittest/LoggingWrappers.swift.gyb
index 32ff5ce..1cac3f9 100644
--- a/stdlib/private/StdlibCollectionUnittest/LoggingWrappers.swift.gyb
+++ b/stdlib/private/StdlibCollectionUnittest/LoggingWrappers.swift.gyb
@@ -414,9 +414,7 @@
return base.isEmpty
}
- public typealias IndexDistance = Base.IndexDistance
-
- public var count: IndexDistance {
+ public var count: Int {
Log.count[selfType] += 1
return base.count
}
@@ -433,19 +431,19 @@
return base.first
}
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
Log.advance[selfType] += 1
return base.index(i, offsetBy: n)
}
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
Log.advanceLimit[selfType] += 1
return base.index(i, offsetBy: n, limitedBy: limit)
}
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
Log.distance[selfType] += 1
return base.distance(from: start, to: end)
}
@@ -558,7 +556,7 @@
base.replaceSubrange(bounds, with: newElements)
}
- public mutating func reserveCapacity(_ n: IndexDistance) {
+ public mutating func reserveCapacity(_ n: Int) {
Log.reserveCapacity[selfType] += 1
base.reserveCapacity(n)
}
@@ -601,8 +599,8 @@
public typealias Log = MutableCollectionLog
public typealias SubSequence = Base.SubSequence
-
public typealias Iterator = Base.Iterator
+ public typealias Element = Base.Element
public init(wrapping base: Base) {
self.base = base
@@ -613,6 +611,7 @@
}
public typealias Index = Base.Index
+ public typealias Indices = Base.Indices
public var startIndex: Index {
return base.startIndex
@@ -621,8 +620,12 @@
public var endIndex: Index {
return base.endIndex
}
-
- public subscript(position: Index) -> Base.Iterator.Element {
+
+ public var indices: Indices {
+ return base.indices
+ }
+
+ public subscript(position: Index) -> Element {
get {
return base[position]
}
@@ -650,11 +653,11 @@
}
% end
- public func index(_ i: Index, offsetBy n: Base.IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return base.index(i, offsetBy: n)
}
- public func distance(from start: Index, to end: Index) -> Base.IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return base.distance(from: start, to: end)
}
diff --git a/stdlib/private/StdlibCollectionUnittest/MinimalCollections.swift.gyb b/stdlib/private/StdlibCollectionUnittest/MinimalCollections.swift.gyb
index f604350..ee364bf 100644
--- a/stdlib/private/StdlibCollectionUnittest/MinimalCollections.swift.gyb
+++ b/stdlib/private/StdlibCollectionUnittest/MinimalCollections.swift.gyb
@@ -497,13 +497,6 @@
// Minimal***[Mutable]?Collection
//===----------------------------------------------------------------------===//
-/*
-FIXME: swift-3-indexing-model: generate three variants, with Int, Int8 and
-Int64 distances.
-
- public typealias Distance = {Distance}
-*/
-
% for Traversal in TRAVERSALS:
% for Mutable in [ False, True ]:
% for RangeReplaceable in [ False, True ]:
@@ -545,10 +538,6 @@
}
}
-% if StrideableIndex:
- public typealias Indices = CountableRange<${Index}>
-% end
-
% if RangeReplaceable:
public init() {
self.underestimatedCount = 0
@@ -573,7 +562,6 @@
}
public typealias Index = ${Index}
- public typealias IndexDistance = Int
internal func _index(forPosition i: Int) -> ${Index} {
return ${Index}(
@@ -603,6 +591,13 @@
return _uncheckedIndex(forPosition: _elements.endIndex)
}
+% if StrideableIndex:
+ public typealias Indices = CountableRange<${Index}>
+% elif Traversal == 'RandomAccess':
+ // FIXME: this shouldn't be necessary, should come by default
+ public typealias Indices = DefaultRandomAccessIndices<${Self}<T>>
+% end
+
public func _failEarlyRangeCheck(
_ index: ${Index},
bounds: Range<${Index}>
@@ -660,7 +655,7 @@
% end
public func distance(from start: ${Index}, to end: ${Index})
- -> IndexDistance {
+ -> Int {
% if Traversal == 'Forward':
_precondition(start <= end,
"Only BidirectionalCollections can have end come before start")
@@ -675,7 +670,7 @@
return end.position - start.position
}
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
% if Traversal == 'Forward':
_precondition(n >= 0,
"Only BidirectionalCollections can be advanced by a negative amount")
@@ -869,10 +864,12 @@
public typealias Base = ${Base}<Element>
public typealias Iterator = MinimalIterator<Element>
public typealias Index = ${Index}
- public typealias IndexDistance = Int
% if StrideableIndex:
public typealias Indices = CountableRange<${Index}>
+% elif Traversal == 'RandomAccess':
+ // FIXME: this shouldn't be necessary, should come by default
+ public typealias Indices = DefaultRandomAccessIndices<${Self}<Element>>
% end
% if Mutable or RangeReplaceable:
@@ -932,11 +929,11 @@
% if Traversal == 'RandomAccess':
public func distance(from start: ${Index}, to end: ${Index})
- -> IndexDistance {
+ -> Int {
return base.distance(from: start, to: end)
}
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return base.index(i, offsetBy: n)
}
% end
diff --git a/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb b/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
index 6e3417d..f4a028f 100644
--- a/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
+++ b/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
@@ -415,7 +415,6 @@
iteratorType: X.Iterator.Type,
subSequenceType: X.SubSequence.Type,
indexType: X.Index.Type,
- indexDistanceType: X.IndexDistance.Type,
indicesType: X.Indices.Type
) {}
@@ -426,7 +425,6 @@
iteratorType: X.Iterator.Type,
subSequenceType: X.SubSequence.Type,
indexType: X.Index.Type,
- indexDistanceType: X.IndexDistance.Type,
indicesType: X.Indices.Type
) {}
@@ -437,7 +435,6 @@
iteratorType: X.Iterator.Type,
subSequenceType: X.SubSequence.Type,
indexType: X.Index.Type,
- indexDistanceType: X.IndexDistance.Type,
indicesType: X.Indices.Type
) {}
@@ -2433,7 +2430,7 @@
T : Strideable
>(
_ expected: Range<T>, _ actual: [T], ${TRACE}
-) where T.Stride : SignedInteger {
+) where T.Stride: SignedInteger {
expectEqualsUnordered(
CountableRange(uncheckedBounds:
(lower: expected.lowerBound, upper: expected.upperBound)),
diff --git a/stdlib/public/core/BidirectionalCollection.swift b/stdlib/public/core/BidirectionalCollection.swift
index 9558316..da743bb 100644
--- a/stdlib/public/core/BidirectionalCollection.swift
+++ b/stdlib/public/core/BidirectionalCollection.swift
@@ -147,7 +147,7 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
if n >= 0 {
return _advanceForward(i, by: n)
}
@@ -160,7 +160,7 @@
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
if n >= 0 {
return _advanceForward(i, by: n, limitedBy: limit)
@@ -176,19 +176,19 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
var start = start
- var count: IndexDistance = 0
+ var count = 0
if start < end {
while start != end {
- count += 1 as IndexDistance
+ count += 1
formIndex(after: &start)
}
}
else if start > end {
while start != end {
- count -= 1 as IndexDistance
+ count -= 1
formIndex(before: &start)
}
}
diff --git a/stdlib/public/core/ClosedRange.swift b/stdlib/public/core/ClosedRange.swift
index b3211dd..b2212d6 100644
--- a/stdlib/public/core/ClosedRange.swift
+++ b/stdlib/public/core/ClosedRange.swift
@@ -173,7 +173,6 @@
/// A type that represents a position in the range.
public typealias Index = ClosedRangeIndex<Bound>
- public typealias IndexDistance = Bound.Stride
/// The position of the first element in the range.
@_inlineable
@@ -213,12 +212,12 @@
}
@_inlineable
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
switch i._value {
case .inRange(let x):
let d = x.distance(to: upperBound)
if n <= d {
- let newPosition = x.advanced(by: n)
+ let newPosition = x.advanced(by: numericCast(n))
_precondition(newPosition >= lowerBound,
"Advancing past start index")
return ClosedRangeIndex(newPosition)
@@ -230,24 +229,24 @@
return i
}
if n < 0 {
- return index(ClosedRangeIndex(upperBound), offsetBy: (n + 1))
+ return index(ClosedRangeIndex(upperBound), offsetBy: numericCast(n + 1))
}
_preconditionFailure("Advancing past end index")
}
}
@_inlineable
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
switch (start._value, end._value) {
case let (.inRange(left), .inRange(right)):
// in range <--> in range
- return left.distance(to: right)
+ return numericCast(left.distance(to: right))
case let (.inRange(left), .pastEnd):
// in range --> end
- return 1 + left.distance(to: upperBound)
+ return numericCast(1 + left.distance(to: upperBound))
case let (.pastEnd, .inRange(right)):
// in range <-- end
- return upperBound.distance(to: right) - 1
+ return numericCast(upperBound.distance(to: right) - 1)
case (.pastEnd, .pastEnd):
// end <--> end
return 0
diff --git a/stdlib/public/core/Collection.swift b/stdlib/public/core/Collection.swift
index b4226c6..ea210d2 100644
--- a/stdlib/public/core/Collection.swift
+++ b/stdlib/public/core/Collection.swift
@@ -358,7 +358,7 @@
/// "past the end" position that's not valid for use as a subscript
/// argument.
associatedtype Index : Comparable
-
+
/// The position of the first element in a nonempty collection.
///
/// If the collection is empty, `startIndex` is equal to `endIndex`.
@@ -381,10 +381,6 @@
/// If the collection is empty, `endIndex` is equal to `startIndex`.
var endIndex: Index { get }
- /// A type that represents the number of steps between a pair of
- /// indices.
- associatedtype IndexDistance : SignedInteger = Int
-
/// A type that provides the collection's iteration interface and
/// encapsulates its iteration state.
///
@@ -405,9 +401,7 @@
/// This associated type appears as a requirement in the `Sequence`
/// protocol, but it is restated here with stricter constraints. In a
/// collection, the subsequence should also conform to `Collection`.
- associatedtype SubSequence = Slice<Self>
- where SubSequence.Index == Index,
- SubSequence.IndexDistance == IndexDistance
+ associatedtype SubSequence = Slice<Self> where SubSequence.Index == Index
/// Accesses the element at the specified position.
///
@@ -612,7 +606,7 @@
/// - Complexity: O(1) if the collection conforms to
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the length
/// of the collection.
- var count: IndexDistance { get }
+ var count: Int { get }
// The following requirement enables dispatching for index(of:) when
// the element type is Equatable.
@@ -659,7 +653,7 @@
/// - Complexity: O(1) if the collection conforms to
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the absolute
/// value of `n`.
- func index(_ i: Index, offsetBy n: IndexDistance) -> Index
+ func index(_ i: Index, offsetBy n: Int) -> Index
/// Returns an index that is the specified distance from the given index,
/// unless that distance is beyond a given limiting index.
@@ -702,7 +696,7 @@
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the absolute
/// value of `n`.
func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index?
/// Returns the distance between two indices.
@@ -721,7 +715,7 @@
/// - Complexity: O(1) if the collection conforms to
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the
/// resulting distance.
- func distance(from start: Index, to end: Index) -> IndexDistance
+ func distance(from start: Index, to end: Index) -> Int
/// Performs a range check in O(1), or a no-op when a range check is not
/// implementable in O(1).
@@ -782,6 +776,9 @@
/// - Parameter i: A valid index of the collection. `i` must be less than
/// `endIndex`.
func formIndex(after i: inout Index)
+
+ @available(swift, deprecated, message: "all index distances are now of type Int")
+ typealias IndexDistance = Int
}
/// Default implementation for forward collections.
@@ -861,7 +858,7 @@
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the absolute
/// value of `n`.
@_inlineable
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return self._advanceForward(i, by: n)
}
@@ -907,7 +904,7 @@
/// value of `n`.
@_inlineable
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
return self._advanceForward(i, by: n, limitedBy: limit)
}
@@ -926,7 +923,7 @@
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the absolute
/// value of `n`.
@_inlineable
- public func formIndex(_ i: inout Index, offsetBy n: IndexDistance) {
+ public func formIndex(_ i: inout Index, offsetBy n: Int) {
i = index(i, offsetBy: n)
}
@@ -953,7 +950,7 @@
/// value of `n`.
@_inlineable
public func formIndex(
- _ i: inout Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: inout Index, offsetBy n: Int, limitedBy limit: Index
) -> Bool {
if let advancedIndex = index(i, offsetBy: n, limitedBy: limit) {
i = advancedIndex
@@ -980,12 +977,12 @@
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the
/// resulting distance.
@_inlineable
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
_precondition(start <= end,
"Only BidirectionalCollections can have end come before start")
var start = start
- var count: IndexDistance = 0
+ var count = 0
while start != end {
count = count + 1
formIndex(after: &start)
@@ -997,7 +994,7 @@
@_inlineable
@_versioned
@inline(__always)
- internal func _advanceForward(_ i: Index, by n: IndexDistance) -> Index {
+ internal func _advanceForward(_ i: Index, by n: Int) -> Index {
_precondition(n >= 0,
"Only BidirectionalCollections can be advanced by a negative amount")
@@ -1013,7 +1010,7 @@
@_versioned
@inline(__always)
internal func _advanceForward(
- _ i: Index, by n: IndexDistance, limitedBy limit: Index
+ _ i: Index, by n: Int, limitedBy limit: Index
) -> Index? {
_precondition(n >= 0,
"Only BidirectionalCollections can be advanced by a negative amount")
@@ -1167,7 +1164,7 @@
/// `RandomAccessCollection`; otherwise, O(*n*), where *n* is the length
/// of the collection.
@_inlineable
- public var count: IndexDistance {
+ public var count: Int {
return distance(from: startIndex, to: endIndex)
}
@@ -1701,9 +1698,30 @@
// guarantees of Swift 3, but it cannot due to a bug.
@available(*, unavailable, renamed: "Iterator")
public typealias Generator = Iterator
-}
-extension Collection {
@available(swift, deprecated: 3.2, renamed: "Element")
public typealias _Element = Element
+
+ @available(*, deprecated, message: "all index distances are now of type Int")
+ public func index<T: BinaryInteger>(_ i: Index, offsetBy n: T) -> Index {
+ return index(i, offsetBy: Int(n))
+ }
+ /* FIXME: crashes the compiler
+ @available(*, deprecated, message: "all index distances are now of type Int")
+ public func formIndex<T: BinaryInteger>(_ i: Index, offsetBy n: T) {
+ return formIndex(i, offsetBy: Int(n))
+ }
+ @available(*, deprecated, message: "all index distances are now of type Int")
+ public func index<T: BinaryInteger>(_ i: Index, offsetBy n: T, limitedBy limit: Index) -> Index {
+ return index(i, offsetBy: Int(n), limitedBy: limit)
+ }
+ */
+ @available(*, deprecated, message: "all index distances are now of type Int")
+ public func formIndex<T: BinaryInteger>(_ i: inout Index, offsetBy n: T, limitedBy limit: Index) -> Bool {
+ return formIndex(&i, offsetBy: Int(n), limitedBy: limit)
+ }
+ @available(*, deprecated, message: "all index distances are now of type Int")
+ public func distance<T: BinaryInteger>(from start: Index, to end: Index) -> T {
+ return numericCast(distance(from: start, to: end) as Int)
+ }
}
diff --git a/stdlib/public/core/EmptyCollection.swift b/stdlib/public/core/EmptyCollection.swift
index a8b43de..d893877 100644
--- a/stdlib/public/core/EmptyCollection.swift
+++ b/stdlib/public/core/EmptyCollection.swift
@@ -51,7 +51,6 @@
/// Valid indices consist of the position of every element and a
/// "past the end" position that's not valid for use as a subscript.
public typealias Index = Int
- public typealias IndexDistance = Int
public typealias Indices = CountableRange<Int>
public typealias SubSequence = EmptyCollection<Element>
@@ -124,14 +123,14 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
_debugPrecondition(i == startIndex && n == 0, "Index out of range")
return i
}
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
_debugPrecondition(i == startIndex && limit == startIndex,
"Index out of range")
@@ -140,7 +139,7 @@
/// The distance between two indexes (always zero).
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
_debugPrecondition(start == 0, "From must be startIndex (or endIndex)")
_debugPrecondition(end == 0, "To must be endIndex (or startIndex)")
return 0
diff --git a/stdlib/public/core/ExistentialCollection.swift.gyb b/stdlib/public/core/ExistentialCollection.swift.gyb
index e585ba5..0fb219a 100644
--- a/stdlib/public/core/ExistentialCollection.swift.gyb
+++ b/stdlib/public/core/ExistentialCollection.swift.gyb
@@ -331,7 +331,7 @@
@_versioned
@_inlineable
internal func _index(
- _ i: _AnyIndexBox, offsetBy n: Int64
+ _ i: _AnyIndexBox, offsetBy n: Int
) -> _AnyIndexBox {
_abstract()
}
@@ -339,21 +339,21 @@
@_versioned
@_inlineable
internal func _index(
- _ i: _AnyIndexBox, offsetBy n: Int64, limitedBy limit: _AnyIndexBox
+ _ i: _AnyIndexBox, offsetBy n: Int, limitedBy limit: _AnyIndexBox
) -> _AnyIndexBox? {
_abstract()
}
@_versioned
@_inlineable
- internal func _formIndex(_ i: inout _AnyIndexBox, offsetBy n: Int64) {
+ internal func _formIndex(_ i: inout _AnyIndexBox, offsetBy n: Int) {
_abstract()
}
@_versioned
@_inlineable
internal func _formIndex(
- _ i: inout _AnyIndexBox, offsetBy n: Int64, limitedBy limit: _AnyIndexBox
+ _ i: inout _AnyIndexBox, offsetBy n: Int, limitedBy limit: _AnyIndexBox
) -> Bool {
_abstract()
}
@@ -362,7 +362,7 @@
@_inlineable
internal func _distance(
from start: _AnyIndexBox, to end: _AnyIndexBox
- ) -> Int64 {
+ ) -> Int {
_abstract()
}
@@ -381,7 +381,7 @@
@_inlineable // FIXME(sil-serialize-all)
@_versioned
- internal var _count: Int64 { _abstract() }
+ internal var _count: Int { _abstract() }
// TODO: swift-3-indexing-model: forward the following methods.
/*
@@ -628,7 +628,7 @@
@_versioned
@_inlineable
internal override func _index(
- _ i: _AnyIndexBox, offsetBy n: Int64
+ _ i: _AnyIndexBox, offsetBy n: Int
) -> _AnyIndexBox {
return _IndexBox(_base: _base.index(_unbox(i), offsetBy: numericCast(n)))
}
@@ -637,7 +637,7 @@
@_inlineable
internal override func _index(
_ i: _AnyIndexBox,
- offsetBy n: Int64,
+ offsetBy n: Int,
limitedBy limit: _AnyIndexBox
) -> _AnyIndexBox? {
return _base.index(
@@ -650,7 +650,7 @@
@_versioned
@_inlineable
internal override func _formIndex(
- _ i: inout _AnyIndexBox, offsetBy n: Int64
+ _ i: inout _AnyIndexBox, offsetBy n: Int
) {
if let box = i as? _IndexBox<S.Index> {
return _base.formIndex(&box._base, offsetBy: numericCast(n))
@@ -661,7 +661,7 @@
@_versioned
@_inlineable
internal override func _formIndex(
- _ i: inout _AnyIndexBox, offsetBy n: Int64, limitedBy limit: _AnyIndexBox
+ _ i: inout _AnyIndexBox, offsetBy n: Int, limitedBy limit: _AnyIndexBox
) -> Bool {
if let box = i as? _IndexBox<S.Index> {
return _base.formIndex(
@@ -677,13 +677,13 @@
internal override func _distance(
from start: _AnyIndexBox,
to end: _AnyIndexBox
- ) -> Int64 {
+ ) -> Int {
return numericCast(_base.distance(from: _unbox(start), to: _unbox(end)))
}
@_versioned
@_inlineable
- internal override var _count: Int64 {
+ internal override var _count: Int {
return numericCast(_base.count)
}
@@ -1045,7 +1045,6 @@
public typealias Iterator = AnyIterator<Element>
public typealias Index = AnyIndex
- public typealias IndexDistance = Int64
public typealias SubSequence = ${Self}<Element>
% for SubTraversal in TRAVERSALS[ti:]:
@@ -1152,20 +1151,20 @@
}
@_inlineable
- public func index(_ i: Index, offsetBy n: Int64) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return AnyIndex(_box: _box._index(i._box, offsetBy: n))
}
@_inlineable
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
return _box._index(i._box, offsetBy: n, limitedBy: limit._box)
.map { AnyIndex(_box:$0) }
}
@_inlineable
- public func formIndex(_ i: inout Index, offsetBy n: IndexDistance) {
+ public func formIndex(_ i: inout Index, offsetBy n: Int) {
if _isUnique(&i._box) {
return _box._formIndex(&i._box, offsetBy: n)
} else {
@@ -1176,7 +1175,7 @@
@_inlineable
public func formIndex(
_ i: inout Index,
- offsetBy n: IndexDistance,
+ offsetBy n: Int,
limitedBy limit: Index
) -> Bool {
if _isUnique(&i._box) {
@@ -1191,7 +1190,7 @@
}
@_inlineable
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _box._distance(from: start._box, to: end._box)
}
@@ -1205,7 +1204,7 @@
% end
/// - Complexity: ${'O(1)' if Traversal == 'RandomAccess' else 'O(*n*)'}
@_inlineable
- public var count: IndexDistance {
+ public var count: Int {
return _box._count
}
diff --git a/stdlib/public/core/Filter.swift.gyb b/stdlib/public/core/Filter.swift.gyb
index e871579..86d5d94 100644
--- a/stdlib/public/core/Filter.swift.gyb
+++ b/stdlib/public/core/Filter.swift.gyb
@@ -151,7 +151,6 @@
/// "past the end" position that's not valid for use as a subscript.
public typealias Index = Base.Index
- public typealias IndexDistance = Base.IndexDistance
/// Creates an instance containing the elements of `base` that
/// satisfy `isIncluded`.
diff --git a/stdlib/public/core/FixedArray.swift.gyb b/stdlib/public/core/FixedArray.swift.gyb
index 588f1f1..a8387dd 100644
--- a/stdlib/public/core/FixedArray.swift.gyb
+++ b/stdlib/public/core/FixedArray.swift.gyb
@@ -42,7 +42,6 @@
extension _FixedArray${N} : RandomAccessCollection, MutableCollection {
internal typealias Index = Int
- internal typealias IndexDistance = Int
@_inlineable // FIXME(sil-serialize-all)
@_versioned // FIXME(sil-serialize-all)
@@ -57,7 +56,7 @@
}
@_versioned // FIXME(sil-serialize-all)
- internal var count : IndexDistance { return _FixedArray${N}._arraySize }
+ internal var count : Int { return _FixedArray${N}._arraySize }
@_inlineable // FIXME(sil-serialize-all)
@_versioned // FIXME(sil-serialize-all)
diff --git a/stdlib/public/core/Flatten.swift.gyb b/stdlib/public/core/Flatten.swift.gyb
index 9c6fbbe..6dfa55a 100644
--- a/stdlib/public/core/Flatten.swift.gyb
+++ b/stdlib/public/core/Flatten.swift.gyb
@@ -261,8 +261,6 @@
/// "past the end" position that's not valid for use as a subscript.
public typealias Index = ${Index}<Base>
- public typealias IndexDistance = Base.IndexDistance
-
/// Creates a flattened view of `base`.
@_inlineable // FIXME(sil-serialize-all)
public init(_ base: Base) {
diff --git a/stdlib/public/core/Indices.swift b/stdlib/public/core/Indices.swift
index 638e6d1..8f4307c 100644
--- a/stdlib/public/core/Indices.swift
+++ b/stdlib/public/core/Indices.swift
@@ -39,8 +39,7 @@
public typealias Element = Elements.Index
public typealias Indices = DefaultIndices<Elements>
public typealias SubSequence = DefaultIndices<Elements>
- public typealias IndexDistance = Elements.IndexDistance
- public typealias Iterator = IndexingIterator<DefaultIndices<Elements>>
+ public typealias Iterator = IndexingIterator<DefaultIndices<Elements>>
@_inlineable
public var startIndex: Index {
diff --git a/stdlib/public/core/Integers.swift.gyb b/stdlib/public/core/Integers.swift.gyb
index f5fadc6..dbfc953 100644
--- a/stdlib/public/core/Integers.swift.gyb
+++ b/stdlib/public/core/Integers.swift.gyb
@@ -2898,6 +2898,9 @@
: FixedWidthInteger, ${Unsigned}Integer,
_ExpressibleByBuiltinIntegerLiteral {
+ public typealias IntegerLiteralType = ${Self}
+
+
@_inlineable // FIXME(sil-serialize-all)
@_transparent
public init(_builtinIntegerLiteral x: _MaxBuiltinIntegerType) {
diff --git a/stdlib/public/core/LazyCollection.swift.gyb b/stdlib/public/core/LazyCollection.swift.gyb
index 8244cd7..2ea4e0c 100644
--- a/stdlib/public/core/LazyCollection.swift.gyb
+++ b/stdlib/public/core/LazyCollection.swift.gyb
@@ -182,7 +182,7 @@
/// - Complexity: O(1) if `Self` conforms to `RandomAccessCollection`;
/// O(*n*) otherwise.
@_inlineable
- public var count: Base.IndexDistance {
+ public var count: Int {
return _base.count
}
@@ -208,21 +208,21 @@
// TODO: swift-3-indexing-model - add docs
@_inlineable
- public func index(_ i: Index, offsetBy n: Base.IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return _base.index(i, offsetBy: n)
}
// TODO: swift-3-indexing-model - add docs
@_inlineable
public func index(
- _ i: Index, offsetBy n: Base.IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
return _base.index(i, offsetBy: n, limitedBy: limit)
}
// TODO: swift-3-indexing-model - add docs
@_inlineable
- public func distance(from start: Index, to end: Index) -> Base.IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _base.distance(from:start, to: end)
}
diff --git a/stdlib/public/core/Map.swift.gyb b/stdlib/public/core/Map.swift.gyb
index a3302c2..1a73442 100644
--- a/stdlib/public/core/Map.swift.gyb
+++ b/stdlib/public/core/Map.swift.gyb
@@ -155,8 +155,6 @@
return SubSequence(_base: _base[bounds], transform: _transform)
}
- public typealias IndexDistance = Base.IndexDistance
-
public typealias Indices = Base.Indices
@_inlineable
@@ -178,7 +176,7 @@
/// - Complexity: O(1) if `Index` conforms to `RandomAccessIndex`; O(*n*)
/// otherwise.
@_inlineable
- public var count: Base.IndexDistance {
+ public var count: Int {
return _base.count
}
@@ -191,19 +189,19 @@
% end
@_inlineable
- public func index(_ i: Index, offsetBy n: Base.IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return _base.index(i, offsetBy: n)
}
@_inlineable
public func index(
- _ i: Index, offsetBy n: Base.IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
return _base.index(i, offsetBy: n, limitedBy: limit)
}
@_inlineable
- public func distance(from start: Index, to end: Index) -> Base.IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _base.distance(from: start, to: end)
}
@@ -282,7 +280,7 @@
public static func + <
Other : LazyCollectionProtocol
>(lhs: LazyMapCollection, rhs: Other) -> [Element]
- where Other.Element == Element, Other.IndexDistance == IndexDistance {
+ where Other.Element == Element {
var result: [Element] = []
result.reserveCapacity(numericCast(lhs.count + rhs.count))
result.append(contentsOf: lhs)
diff --git a/stdlib/public/core/Mirror.swift b/stdlib/public/core/Mirror.swift
index 92f5b09..c3fca5b 100644
--- a/stdlib/public/core/Mirror.swift
+++ b/stdlib/public/core/Mirror.swift
@@ -485,7 +485,7 @@
if case let label as String = e {
position = children.index { $0.label == label } ?? children.endIndex
}
- else if let offset = (e as? Int).map({ Int64($0) }) ?? (e as? Int64) {
+ else if let offset = e as? Int {
position = children.index(children.startIndex,
offsetBy: offset,
limitedBy: children.endIndex) ?? children.endIndex
diff --git a/stdlib/public/core/RandomAccessCollection.swift b/stdlib/public/core/RandomAccessCollection.swift
index 3a47000..98c1157 100644
--- a/stdlib/public/core/RandomAccessCollection.swift
+++ b/stdlib/public/core/RandomAccessCollection.swift
@@ -155,7 +155,7 @@
/// - Complexity: O(1)
@_inlineable
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
// FIXME: swift-3-indexing-model: tests.
let l = distance(from: i, to: limit)
@@ -168,7 +168,7 @@
extension RandomAccessCollection
where Index : Strideable,
- Index.Stride == IndexDistance,
+ Index.Stride == Int,
Indices == CountableRange<Index> {
/// The indices that are valid for subscripting the collection, in ascending
diff --git a/stdlib/public/core/Range.swift.gyb b/stdlib/public/core/Range.swift.gyb
index b717db6..b488d78 100644
--- a/stdlib/public/core/Range.swift.gyb
+++ b/stdlib/public/core/Range.swift.gyb
@@ -178,7 +178,6 @@
/// A type that represents a position in the range.
public typealias Index = Element
- public typealias IndexDistance = Bound.Stride
public typealias Indices = CountableRange<Bound>
public typealias SubSequence = CountableRange<Bound>
@@ -208,16 +207,16 @@
}
@_inlineable
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
- let r = i.advanced(by: n)
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
+ let r = i.advanced(by: numericCast(n))
_precondition(r >= lowerBound)
_precondition(r <= upperBound)
return r
}
@_inlineable
- public func distance(from start: Index, to end: Index) -> IndexDistance {
- return start.distance(to: end)
+ public func distance(from start: Index, to end: Index) -> Int {
+ return numericCast(start.distance(to: end))
}
/// Accesses the subsequence bounded by the given range.
diff --git a/stdlib/public/core/RangeReplaceableCollection.swift b/stdlib/public/core/RangeReplaceableCollection.swift
index 2931e69..b326436 100644
--- a/stdlib/public/core/RangeReplaceableCollection.swift
+++ b/stdlib/public/core/RangeReplaceableCollection.swift
@@ -131,7 +131,7 @@
/// less storage than requested, or to take no action at all.
///
/// - Parameter n: The requested number of elements to store.
- mutating func reserveCapacity(_ n: IndexDistance)
+ mutating func reserveCapacity(_ n: Int)
//===--- Derivable Requirements -----------------------------------------===//
@@ -647,7 +647,7 @@
///
/// - Parameter n: The requested number of elements to store.
@_inlineable
- public mutating func reserveCapacity(_ n: IndexDistance) {}
+ public mutating func reserveCapacity(_ n: Int) {}
}
extension RangeReplaceableCollection where SubSequence == Self {
diff --git a/stdlib/public/core/Reverse.swift b/stdlib/public/core/Reverse.swift
index cb35cc3..f9303ad 100644
--- a/stdlib/public/core/Reverse.swift
+++ b/stdlib/public/core/Reverse.swift
@@ -184,7 +184,6 @@
/// Valid indices consist of the position of every element and a
/// "past the end" position that's not valid for use as a subscript.
public typealias Index = ReversedIndex<Base>
- public typealias IndexDistance = Base.IndexDistance
@_fixed_layout
public struct Iterator : IteratorProtocol, Sequence {
@@ -237,14 +236,14 @@
}
@_inlineable
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
// FIXME: swift-3-indexing-model: `-n` can trap on Int.min.
return ReversedIndex(_base.index(i.base, offsetBy: -n))
}
@_inlineable
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
// FIXME: swift-3-indexing-model: `-n` can trap on Int.min.
return _base.index(i.base, offsetBy: -n, limitedBy: limit.base)
@@ -252,7 +251,7 @@
}
@_inlineable
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _base.distance(from: end.base, to: start.base)
}
diff --git a/stdlib/public/core/SentinelCollection.swift b/stdlib/public/core/SentinelCollection.swift
index 05274db..f150c80 100644
--- a/stdlib/public/core/SentinelCollection.swift
+++ b/stdlib/public/core/SentinelCollection.swift
@@ -64,8 +64,6 @@
@_versioned // FIXME(sil-serialize-all)
internal var _base : Base
- internal typealias IndexDistance = Base.IndexDistance
-
@_inlineable // FIXME(sil-serialize-all)
@_versioned // FIXME(sil-serialize-all)
internal func makeIterator() -> _SentinelIterator<Base.Iterator, IsSentinel> {
diff --git a/stdlib/public/core/Slice.swift b/stdlib/public/core/Slice.swift
index 76bbd6e..f0c6f2b 100644
--- a/stdlib/public/core/Slice.swift
+++ b/stdlib/public/core/Slice.swift
@@ -140,7 +140,6 @@
extension Slice: Collection {
public typealias Index = Base.Index
public typealias Indices = Base.Indices
- public typealias IndexDistance = Base.IndexDistance
public typealias Element = Base.Element
public typealias SubSequence = Slice<Base>
public typealias Iterator = IndexingIterator<Slice<Base>>
@@ -188,21 +187,21 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
// FIXME: swift-3-indexing-model: range check.
return _base.index(i, offsetBy: n)
}
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
// FIXME: swift-3-indexing-model: range check.
return _base.index(i, offsetBy: n, limitedBy: limit)
}
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
// FIXME: swift-3-indexing-model: range check.
return _base.distance(from: start, to: end)
}
@@ -293,12 +292,12 @@
) where C : Collection, C.Element == Base.Element {
// FIXME: swift-3-indexing-model: range check.
- let sliceOffset: IndexDistance =
+ let sliceOffset =
_base.distance(from: _base.startIndex, to: _startIndex)
- let newSliceCount: IndexDistance =
+ let newSliceCount =
_base.distance(from: _startIndex, to: subRange.lowerBound)
+ _base.distance(from: subRange.upperBound, to: _endIndex)
- + (numericCast(newElements.count) as IndexDistance)
+ + (numericCast(newElements.count) as Int)
_base.replaceSubrange(subRange, with: newElements)
_startIndex = _base.index(_base.startIndex, offsetBy: sliceOffset)
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -307,9 +306,8 @@
@_inlineable // FIXME(sil-serialize-all)
public mutating func insert(_ newElement: Base.Element, at i: Index) {
// FIXME: swift-3-indexing-model: range check.
- let sliceOffset: IndexDistance =
- _base.distance(from: _base.startIndex, to: _startIndex)
- let newSliceCount: IndexDistance = count + 1
+ let sliceOffset = _base.distance(from: _base.startIndex, to: _startIndex)
+ let newSliceCount = count + 1
_base.insert(newElement, at: i)
_startIndex = _base.index(_base.startIndex, offsetBy: sliceOffset)
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -320,10 +318,8 @@
where S: Collection, S.Element == Base.Element {
// FIXME: swift-3-indexing-model: range check.
- let sliceOffset: IndexDistance =
- _base.distance(from: _base.startIndex, to: _startIndex)
- let newSliceCount: IndexDistance =
- count + (numericCast(newElements.count) as IndexDistance)
+ let sliceOffset = _base.distance(from: _base.startIndex, to: _startIndex)
+ let newSliceCount = count + newElements.count
_base.insert(contentsOf: newElements, at: i)
_startIndex = _base.index(_base.startIndex, offsetBy: sliceOffset)
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -332,9 +328,8 @@
@_inlineable // FIXME(sil-serialize-all)
public mutating func remove(at i: Index) -> Base.Element {
// FIXME: swift-3-indexing-model: range check.
- let sliceOffset: IndexDistance =
- _base.distance(from: _base.startIndex, to: _startIndex)
- let newSliceCount: IndexDistance = count - 1
+ let sliceOffset = _base.distance(from: _base.startIndex, to: _startIndex)
+ let newSliceCount = count - 1
let result = _base.remove(at: i)
_startIndex = _base.index(_base.startIndex, offsetBy: sliceOffset)
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -344,9 +339,8 @@
@_inlineable // FIXME(sil-serialize-all)
public mutating func removeSubrange(_ bounds: Range<Index>) {
// FIXME: swift-3-indexing-model: range check.
- let sliceOffset: IndexDistance =
- _base.distance(from: _base.startIndex, to: _startIndex)
- let newSliceCount: IndexDistance =
+ let sliceOffset = _base.distance(from: _base.startIndex, to: _startIndex)
+ let newSliceCount =
count - distance(from: bounds.lowerBound, to: bounds.upperBound)
_base.removeSubrange(bounds)
_startIndex = _base.index(_base.startIndex, offsetBy: sliceOffset)
@@ -363,10 +357,10 @@
) where C : Collection, C.Element == Base.Element {
// FIXME: swift-3-indexing-model: range check.
if subRange.lowerBound == _base.startIndex {
- let newSliceCount: IndexDistance =
+ let newSliceCount =
_base.distance(from: _startIndex, to: subRange.lowerBound)
+ _base.distance(from: subRange.upperBound, to: _endIndex)
- + (numericCast(newElements.count) as IndexDistance)
+ + (numericCast(newElements.count) as Int)
_base.replaceSubrange(subRange, with: newElements)
_startIndex = _base.startIndex
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -375,7 +369,7 @@
let lastValidIndex = _base.index(before: subRange.lowerBound)
let newEndIndexOffset =
_base.distance(from: subRange.upperBound, to: _endIndex)
- + (numericCast(newElements.count) as IndexDistance) + 1
+ + (numericCast(newElements.count) as Int) + 1
_base.replaceSubrange(subRange, with: newElements)
if shouldUpdateStartIndex {
_startIndex = _base.index(after: lastValidIndex)
@@ -388,7 +382,7 @@
public mutating func insert(_ newElement: Base.Element, at i: Index) {
// FIXME: swift-3-indexing-model: range check.
if i == _base.startIndex {
- let newSliceCount: IndexDistance = count + 1
+ let newSliceCount = count + 1
_base.insert(newElement, at: i)
_startIndex = _base.startIndex
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -409,8 +403,7 @@
where S : Collection, S.Element == Base.Element {
// FIXME: swift-3-indexing-model: range check.
if i == _base.startIndex {
- let newSliceCount: IndexDistance =
- count + (numericCast(newElements.count) as IndexDistance)
+ let newSliceCount = count + numericCast(newElements.count)
_base.insert(contentsOf: newElements, at: i)
_startIndex = _base.startIndex
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -419,7 +412,7 @@
let lastValidIndex = _base.index(before: i)
let newEndIndexOffset =
_base.distance(from: i, to: _endIndex)
- + (numericCast(newElements.count) as IndexDistance) + 1
+ + numericCast(newElements.count) + 1
_base.insert(contentsOf: newElements, at: i)
if shouldUpdateStartIndex {
_startIndex = _base.index(after: lastValidIndex)
@@ -432,7 +425,7 @@
public mutating func remove(at i: Index) -> Base.Element {
// FIXME: swift-3-indexing-model: range check.
if i == _base.startIndex {
- let newSliceCount: IndexDistance = count - 1
+ let newSliceCount = count - 1
let result = _base.remove(at: i)
_startIndex = _base.startIndex
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
@@ -454,17 +447,16 @@
public mutating func removeSubrange(_ bounds: Range<Index>) {
// FIXME: swift-3-indexing-model: range check.
if bounds.lowerBound == _base.startIndex {
- let newSliceCount: IndexDistance =
- count
- - _base.distance(from: bounds.lowerBound, to: bounds.upperBound)
+ let newSliceCount =
+ count - _base.distance(from: bounds.lowerBound, to: bounds.upperBound)
_base.removeSubrange(bounds)
_startIndex = _base.startIndex
_endIndex = _base.index(_startIndex, offsetBy: newSliceCount)
} else {
let shouldUpdateStartIndex = bounds.lowerBound == _startIndex
let lastValidIndex = _base.index(before: bounds.lowerBound)
- let newEndIndexOffset: Base.IndexDistance =
- _base.distance(from: bounds.lowerBound, to: _endIndex)
+ let newEndIndexOffset =
+ _base.distance(from: bounds.lowerBound, to: _endIndex)
- _base.distance(from: bounds.lowerBound, to: bounds.upperBound)
+ 1
_base.removeSubrange(bounds)
diff --git a/stdlib/public/core/Stride.swift.gyb b/stdlib/public/core/Stride.swift.gyb
index 0c42e4b..a7a1a77 100644
--- a/stdlib/public/core/Stride.swift.gyb
+++ b/stdlib/public/core/Stride.swift.gyb
@@ -452,7 +452,6 @@
extension StrideThrough : RandomAccessCollection
where Element.Stride : BinaryInteger {
public typealias Index = ClosedRangeIndex<Int>
- public typealias IndexDistance = Int
public typealias SubSequence = Slice<StrideThrough<Element>>
@_inlineable
diff --git a/stdlib/public/core/StringCharacterView.swift b/stdlib/public/core/StringCharacterView.swift
index bd683fc..2b5f3c4 100644
--- a/stdlib/public/core/StringCharacterView.swift
+++ b/stdlib/public/core/StringCharacterView.swift
@@ -211,7 +211,6 @@
}
public typealias Index = String.Index
- public typealias IndexDistance = Int
/// The position of the first character in a nonempty character view.
///
diff --git a/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb b/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb
index 957cd46..8796b21 100644
--- a/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb
+++ b/stdlib/public/core/StringRangeReplaceableCollection.swift.gyb
@@ -11,13 +11,6 @@
//===----------------------------------------------------------------------===//
extension String : StringProtocol, RangeReplaceableCollection {
- /// A type that represents the number of steps between two `String.Index`
- /// values, where one value is reachable from the other.
- ///
- /// In Swift, *reachability* refers to the ability to produce one value from
- /// the other through zero or more applications of `index(after:)`.
- public typealias IndexDistance = _CharacterView.IndexDistance
-
public typealias SubSequence = Substring
/// Creates a string representing the given character repeated the specified
@@ -128,7 +121,7 @@
///
/// - Complexity: O(*n*), where *n* is the absolute value of `n`.
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return _characters.index(i, offsetBy: n)
}
@@ -171,7 +164,7 @@
/// - Complexity: O(*n*), where *n* is the absolute value of `n`.
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
return _characters.index(i, offsetBy: n, limitedBy: limit)
}
@@ -186,7 +179,7 @@
///
/// - Complexity: O(*n*), where *n* is the resulting distance.
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _characters.distance(from: start, to: end)
}
diff --git a/stdlib/public/core/StringUTF16.swift b/stdlib/public/core/StringUTF16.swift
index d290564..44a0c30 100644
--- a/stdlib/public/core/StringUTF16.swift
+++ b/stdlib/public/core/StringUTF16.swift
@@ -105,7 +105,6 @@
CustomDebugStringConvertible {
public typealias Index = String.Index
- public typealias IndexDistance = Int
/// The position of the first code unit if the `String` is
/// nonempty; identical to `endIndex` otherwise.
@@ -164,7 +163,7 @@
// TODO: swift-3-indexing-model - add docs
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
// FIXME: swift-3-indexing-model: range check i?
return Index(encodedOffset: i.encodedOffset.advanced(by: n))
}
@@ -172,7 +171,7 @@
// TODO: swift-3-indexing-model - add docs
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
// FIXME: swift-3-indexing-model: range check i?
let d = i.encodedOffset.distance(to: limit.encodedOffset)
@@ -184,7 +183,7 @@
// TODO: swift-3-indexing-model - add docs
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
// FIXME: swift-3-indexing-model: range check start and end?
return start.encodedOffset.distance(to: end.encodedOffset)
}
@@ -448,7 +447,6 @@
extension String.UTF16View.Indices : BidirectionalCollection {
public typealias Index = String.UTF16View.Index
- public typealias IndexDistance = String.UTF16View.IndexDistance
public typealias Indices = String.UTF16View.Indices
public typealias SubSequence = String.UTF16View.Indices
@@ -519,14 +517,14 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
// FIXME: swift-3-indexing-model: range check i?
return _elements.index(i, offsetBy: n)
}
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
// FIXME: swift-3-indexing-model: range check i?
return _elements.index(i, offsetBy: n, limitedBy: limit)
@@ -534,7 +532,7 @@
// TODO: swift-3-indexing-model - add docs
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
// FIXME: swift-3-indexing-model: range check start and end?
return _elements.distance(from: start, to: end)
}
@@ -554,14 +552,14 @@
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional index")
public func index(
- _ i: Index?, offsetBy n: IndexDistance) -> Index {
+ _ i: Index?, offsetBy n: Int) -> Index {
return index(i!, offsetBy: n)
}
@_inlineable // FIXME(sil-serialize-all)
@available(
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional indices")
- public func distance(from i: Index?, to j: Index?) -> IndexDistance {
+ public func distance(from i: Index?, to j: Index?) -> Int {
return distance(from: i!, to: j!)
}
@_inlineable // FIXME(sil-serialize-all)
diff --git a/stdlib/public/core/StringUTF8.swift b/stdlib/public/core/StringUTF8.swift
index 579fbb5..5a84ca9 100644
--- a/stdlib/public/core/StringUTF8.swift
+++ b/stdlib/public/core/StringUTF8.swift
@@ -120,7 +120,6 @@
}
public typealias Index = String.Index
- public typealias IndexDistance = Int
/// The position of the first code unit if the UTF-8 view is
/// nonempty.
@@ -273,7 +272,7 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from i: Index, to j: Index) -> IndexDistance {
+ public func distance(from i: Index, to j: Index) -> Int {
if _fastPath(_core.isASCII) {
return j.encodedOffset - i.encodedOffset
}
@@ -284,8 +283,8 @@
@_inlineable // FIXME(sil-serialize-all)
@_versioned
@inline(__always)
- internal func _forwardDistance(from i: Index, to j: Index) -> IndexDistance {
- var r: IndexDistance = j._transcodedOffset - i._transcodedOffset
+ internal func _forwardDistance(from i: Index, to j: Index) -> Int {
+ var r = j._transcodedOffset - i._transcodedOffset
UTF8._transcode(
_core[i.encodedOffset..<j.encodedOffset], from: UTF16.self) {
r += $0.count
@@ -678,7 +677,7 @@
@available(
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional index")
- public func index(_ i: Index?, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index?, offsetBy n: Int) -> Index {
return index(i!, offsetBy: n)
}
@_inlineable // FIXME(sil-serialize-all)
@@ -686,7 +685,7 @@
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional indices")
public func distance(
- from i: Index?, to j: Index?) -> IndexDistance {
+ from i: Index?, to j: Index?) -> Int {
return distance(from: i!, to: j!)
}
@_inlineable // FIXME(sil-serialize-all)
diff --git a/stdlib/public/core/StringUnicodeScalarView.swift b/stdlib/public/core/StringUnicodeScalarView.swift
index 4724703..8280515 100644
--- a/stdlib/public/core/StringUnicodeScalarView.swift
+++ b/stdlib/public/core/StringUnicodeScalarView.swift
@@ -96,7 +96,6 @@
}
public typealias Index = String.Index
- public typealias IndexDistance = Int
/// Translates a `_core` index into a `UnicodeScalarIndex` using this view's
/// `_coreOffset`.
@@ -528,14 +527,14 @@
@available(
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional index")
- public func index(_ i: Index?, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index?, offsetBy n: Int) -> Index {
return index(i!, offsetBy: n)
}
@_inlineable // FIXME(sil-serialize-all)
@available(
swift, obsoleted: 4.0,
message: "Any String view index conversion can fail in Swift 4; please unwrap the optional indices")
- public func distance(from i: Index?, to j: Index?) -> IndexDistance {
+ public func distance(from i: Index?, to j: Index?) -> Int {
return distance(from: i!, to: j!)
}
@_inlineable // FIXME(sil-serialize-all)
diff --git a/stdlib/public/core/Substring.swift.gyb b/stdlib/public/core/Substring.swift.gyb
index 38d4d63..e1bbea0 100644
--- a/stdlib/public/core/Substring.swift.gyb
+++ b/stdlib/public/core/Substring.swift.gyb
@@ -90,7 +90,6 @@
@_fixed_layout // FIXME(sil-serialize-all)
public struct Substring : StringProtocol {
public typealias Index = String.Index
- public typealias IndexDistance = String.IndexDistance
public typealias SubSequence = Substring
@_versioned // FIXME(sil-serialize-all)
@@ -149,7 +148,7 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
let result = _slice.index(i, offsetBy: n)
// FIXME(strings): slice types currently lack necessary bound checks
_precondition(
@@ -160,7 +159,7 @@
@_inlineable // FIXME(sil-serialize-all)
public func index(
- _ i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
+ _ i: Index, offsetBy n: Int, limitedBy limit: Index
) -> Index? {
let result = _slice.index(i, offsetBy: n, limitedBy: limit)
// FIXME(strings): slice types currently lack necessary bound checks
@@ -172,7 +171,7 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public func distance(from start: Index, to end: Index) -> IndexDistance {
+ public func distance(from start: Index, to end: Index) -> Int {
return _slice.distance(from: start, to: end)
}
diff --git a/stdlib/public/core/UIntBuffer.swift b/stdlib/public/core/UIntBuffer.swift
index 068e0bc..6ba9504 100644
--- a/stdlib/public/core/UIntBuffer.swift
+++ b/stdlib/public/core/UIntBuffer.swift
@@ -130,18 +130,17 @@
extension _UIntBuffer : RandomAccessCollection {
public typealias Indices = DefaultRandomAccessIndices<_UIntBuffer>
- public typealias IndexDistance = Int
@_inlineable // FIXME(sil-serialize-all)
@inline(__always)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
- let x = IndexDistance(i.bitOffset) &+ n &* Element.bitWidth
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
+ let x = Int(i.bitOffset) &+ n &* Element.bitWidth
return Index(bitOffset: UInt8(truncatingIfNeeded: x))
}
@_inlineable // FIXME(sil-serialize-all)
@inline(__always)
- public func distance(from i: Index, to j: Index) -> IndexDistance {
+ public func distance(from i: Index, to j: Index) -> Int {
return (Int(j.bitOffset) &- Int(i.bitOffset)) / Element.bitWidth
}
}
@@ -232,6 +231,6 @@
_storage |= replacement1._storage &<< (headCount &* w)
_storage |= tailBits &<< ((tailOffset &+ growth) &* w)
_bitCount = UInt8(
- truncatingIfNeeded: IndexDistance(_bitCount) &+ growth &* w)
+ truncatingIfNeeded: Int(_bitCount) &+ growth &* w)
}
}
diff --git a/stdlib/public/core/UnsafeBufferPointer.swift.gyb b/stdlib/public/core/UnsafeBufferPointer.swift.gyb
index 2dd8af6..df50805 100644
--- a/stdlib/public/core/UnsafeBufferPointer.swift.gyb
+++ b/stdlib/public/core/UnsafeBufferPointer.swift.gyb
@@ -65,7 +65,6 @@
// struct A { struct B { let x: UnsafeMutableBufferPointer<...> } let b: B }
public typealias Index = Int
- public typealias IndexDistance = Int
public typealias Iterator = UnsafeBufferPointerIterator<Element>
/// The index of the first element in a nonempty buffer.
diff --git a/stdlib/public/core/UnsafeRawBufferPointer.swift.gyb b/stdlib/public/core/UnsafeRawBufferPointer.swift.gyb
index 674e108..b1df79e 100644
--- a/stdlib/public/core/UnsafeRawBufferPointer.swift.gyb
+++ b/stdlib/public/core/UnsafeRawBufferPointer.swift.gyb
@@ -143,7 +143,6 @@
// `_failEarlyRangeCheck` as in `UnsafeBufferPointer`.
public typealias Element = UInt8
public typealias Index = Int
- public typealias IndexDistance = Int
public typealias Indices = CountableRange<Int>
/// Always zero, which is the index of the first byte in a nonempty buffer.
diff --git a/stdlib/public/core/ValidUTF8Buffer.swift b/stdlib/public/core/ValidUTF8Buffer.swift
index b516382..ce43b17 100644
--- a/stdlib/public/core/ValidUTF8Buffer.swift
+++ b/stdlib/public/core/ValidUTF8Buffer.swift
@@ -65,7 +65,6 @@
}
extension _ValidUTF8Buffer : Collection {
- public typealias IndexDistance = Int
@_fixed_layout // FIXME(sil-serialize-all)
public struct Index : Comparable {
@@ -97,7 +96,7 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public var count : IndexDistance {
+ public var count : Int {
return Storage.bitWidth &>> 3 &- _biasedBits.leadingZeroBitCount &>> 3
}
@@ -127,7 +126,7 @@
@_inlineable // FIXME(sil-serialize-all)
@inline(__always)
- public func distance(from i: Index, to j: Index) -> IndexDistance {
+ public func distance(from i: Index, to j: Index) -> Int {
_debugPrecondition(_isValid(i))
_debugPrecondition(_isValid(j))
return (
@@ -137,7 +136,7 @@
@_inlineable // FIXME(sil-serialize-all)
@inline(__always)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
let startOffset = distance(from: startIndex, to: i)
let newOffset = startOffset + n
_debugPrecondition(newOffset >= 0)
@@ -153,12 +152,12 @@
}
@_inlineable // FIXME(sil-serialize-all)
- public var capacity: IndexDistance {
+ public var capacity: Int {
return _ValidUTF8Buffer.capacity
}
@_inlineable // FIXME(sil-serialize-all)
- public static var capacity: IndexDistance {
+ public static var capacity: Int {
return Storage.bitWidth / Element.bitWidth
}
diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift
index dd4c30a..a431c54 100644
--- a/test/Constraints/diagnostics.swift
+++ b/test/Constraints/diagnostics.swift
@@ -161,7 +161,7 @@
// <rdar://problem/21080030> Bad diagnostic for invalid method call in boolean expression: (_, ExpressibleByIntegerLiteral)' is not convertible to 'ExpressibleByIntegerLiteral
func rdar21080030() {
var s = "Hello"
- if s.count() == 0 {} // expected-error{{cannot call value of non-function type 'String.IndexDistance' (aka 'Int')}}{{13-15=}}
+ if s.count() == 0 {} // expected-error{{cannot call value of non-function type 'Int'}}{{13-15=}}
}
// <rdar://problem/21248136> QoI: problem with return type inference mis-diagnosed as invalid arguments
diff --git a/test/Prototypes/Algorithms.swift.gyb b/test/Prototypes/Algorithms.swift.gyb
index 6d1f6b3..4d5f099 100644
--- a/test/Prototypes/Algorithms.swift.gyb
+++ b/test/Prototypes/Algorithms.swift.gyb
@@ -230,7 +230,7 @@
@inline(__always)
internal mutating func _rotateCycle(
start: Index,
- sourceOffsetForIndex: (Index) -> IndexDistance
+ sourceOffsetForIndex: (Index) -> Int
) {
let tmp = self[start]
var i = start
@@ -407,18 +407,17 @@
% end
% if Traversal is 'RandomAccess':
- public func index(_ i: Index, offsetBy n: ${Self}.IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
if n == 0 { return i }
return n > 0 ? _offsetForward(i, by: n) : _offsetBackward(i, by: -n)
}
internal func _offsetForward(
- _ i: Index, by n: ${Self}.IndexDistance
+ _ i: Index, by n: Int
) -> Index {
switch i._position {
case let .first(i):
- let d: ${Self}.IndexDistance = numericCast(
- _base1.distance(from: i, to: _base1.endIndex))
+ let d: Int = _base1.distance(from: i, to: _base1.endIndex)
if n < d {
return ConcatenatedCollectionIndex(
first: _base1.index(i, offsetBy: numericCast(n)))
@@ -433,15 +432,14 @@
}
internal func _offsetBackward(
- _ i: Index, by n: ${Self}.IndexDistance
+ _ i: Index, by n: Int
) -> Index {
switch i._position {
case let .first(i):
return ConcatenatedCollectionIndex(
first: _base1.index(i, offsetBy: -numericCast(n)))
case let .second(i):
- let d: ${Self}.IndexDistance = numericCast(
- _base2.distance(from: _base2.startIndex, to: i))
+ let d: Int = _base2.distance(from: _base2.startIndex, to: i)
if n <= d {
return ConcatenatedCollectionIndex(
second: _base2.index(i, offsetBy: -numericCast(n)))
@@ -529,7 +527,7 @@
}
% end
- public func index(_ i: Index, offsetBy n: ${Self}.IndexDistance) -> Index {
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
return RotatedCollectionIndex(
_index: _concatenation.index(i._index, offsetBy: n))
}
@@ -583,7 +581,7 @@
}
mutating func _stablePartition(
- distance n: IndexDistance,
+ distance n: Int,
choosingStartGroupBy p: (Element) -> Bool
) -> Index {
assert(n >= 0)
diff --git a/test/Prototypes/PatternMatching.swift b/test/Prototypes/PatternMatching.swift
index b34056b..138bdd1 100644
--- a/test/Prototypes/PatternMatching.swift
+++ b/test/Prototypes/PatternMatching.swift
@@ -14,10 +14,10 @@
//===--- Niceties ---------------------------------------------------------===//
extension Collection {
- func index(_ d: IndexDistance) -> Index {
+ func index(_ d: Int) -> Index {
return index(startIndex, offsetBy: d)
}
- func offset(of i: Index) -> IndexDistance {
+ func offset(of i: Index) -> Int {
return distance(from: startIndex, to: i)
}
}
diff --git a/test/Prototypes/UnicodeDecoders.swift b/test/Prototypes/UnicodeDecoders.swift
index 8a01ff3..ee10bc1 100644
--- a/test/Prototypes/UnicodeDecoders.swift
+++ b/test/Prototypes/UnicodeDecoders.swift
@@ -158,13 +158,13 @@
switch parser.parseScalar(from: &more) {
case .valid(let scalarContent):
- let d: CodeUnits.IndexDistance = -numericCast(scalarContent.count)
+ let d: Int = -scalarContent.count
return Index(
codeUnitIndex: codeUnits.index(i.codeUnitIndex, offsetBy: d),
scalar: Encoding.decode(scalarContent),
stride: numericCast(scalarContent.count))
case .error(let stride):
- let d: CodeUnits.IndexDistance = -numericCast(stride)
+ let d: Int = -stride
return Index(
codeUnitIndex: codeUnits.index(i.codeUnitIndex, offsetBy: d) ,
scalar: Unicode.Scalar(_unchecked: 0xfffd),
diff --git a/test/stdlib/DictionaryLiteral.swift b/test/stdlib/DictionaryLiteral.swift
index f295d0c..8fc3c88 100644
--- a/test/stdlib/DictionaryLiteral.swift
+++ b/test/stdlib/DictionaryLiteral.swift
@@ -34,7 +34,6 @@
iteratorType: IndexingIterator<Subject>.self,
subSequenceType: RandomAccessSlice<Subject>.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
diff --git a/test/stdlib/IndexDistanceRemoval.swift b/test/stdlib/IndexDistanceRemoval.swift
new file mode 100644
index 0000000..5c81ccf
--- /dev/null
+++ b/test/stdlib/IndexDistanceRemoval.swift
@@ -0,0 +1,22 @@
+// RUN: %target-typecheck-verify-swift
+
+struct Int64Distance<Element>: Collection {
+ let _storage: [Element]
+
+ typealias Index = Int64
+ typealias IndexDistance = Int64
+
+ var startIndex: Index { return Int64(_storage.startIndex) }
+ var endIndex: Index { return Int64(_storage.startIndex) }
+ func index(after i: Index) -> Index { return i + 1 }
+
+ subscript(i: Index) -> Element { return _storage[Int(i)] }
+}
+
+let c = Int64Distance(_storage: [1,2,3])
+
+let i64: Int64 = 2
+_ = c.index(c.startIndex, offsetBy: i64) // expected-warning {{'index(_:offsetBy:)' is deprecated: all index distances are now of type Int}}
+
+let _: Int64 = c.distance(from: c.startIndex, to: c.endIndex) // expected-warning {{distance(from:to:)' is deprecated: all index distances are now of type Int}}
+
diff --git a/test/stdlib/Inputs/CommonArrayTests.gyb b/test/stdlib/Inputs/CommonArrayTests.gyb
index 12ab7df..6302328 100644
--- a/test/stdlib/Inputs/CommonArrayTests.gyb
+++ b/test/stdlib/Inputs/CommonArrayTests.gyb
@@ -421,6 +421,5 @@
iteratorType: IndexingIterator<Collection>.self,
subSequenceType: CollectionSlice.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
diff --git a/test/stdlib/NSStringAPI.swift b/test/stdlib/NSStringAPI.swift
index 28d6b24..ac7bd20 100644
--- a/test/stdlib/NSStringAPI.swift
+++ b/test/stdlib/NSStringAPI.swift
@@ -1149,7 +1149,7 @@
S : StringProtocol
>(
_ string: S, _ maybeRange: Range<String.Index>?
-) -> Range<Int>? where S.Index == String.Index, S.IndexDistance == Int {
+) -> Range<Int>? where S.Index == String.Index {
guard let range = maybeRange else { return nil }
return
diff --git a/test/stdlib/StringCompatibility.swift b/test/stdlib/StringCompatibility.swift
index b4ee793..f459a15 100644
--- a/test/stdlib/StringCompatibility.swift
+++ b/test/stdlib/StringCompatibility.swift
@@ -17,7 +17,6 @@
extension MyString : BidirectionalCollection {
typealias Iterator = String.Iterator
typealias Index = String.Index
- typealias IndexDistance = String.IndexDistance
typealias SubSequence = MyString
func makeIterator() -> Iterator { return base.makeIterator() }
var startIndex: String.Index { return base.startIndex }
@@ -28,10 +27,10 @@
}
func index(after i: Index) -> Index { return base.index(after: i) }
func index(before i: Index) -> Index { return base.index(before: i) }
- func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
+ func index(_ i: Index, offsetBy n: Int) -> Index {
return base.index(i, offsetBy: n)
}
- func distance(from i: Index, to j: Index) -> IndexDistance {
+ func distance(from i: Index, to j: Index) -> Int {
return base.distance(from: i, to: j)
}
}
diff --git a/utils/sourcekit_fuzzer/sourcekit_fuzzer.swift b/utils/sourcekit_fuzzer/sourcekit_fuzzer.swift
index 3447451..ccaa281 100644
--- a/utils/sourcekit_fuzzer/sourcekit_fuzzer.swift
+++ b/utils/sourcekit_fuzzer/sourcekit_fuzzer.swift
@@ -55,7 +55,7 @@
guard c > 1 else { return }
for (firstUnshuffled , unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) {
- let d: IndexDistance = numericCast(arc4random_uniform(numericCast(unshuffledCount)))
+ let d: Int = numericCast(arc4random_uniform(numericCast(unshuffledCount)))
guard d != 0 else { continue }
let i = index(firstUnshuffled, offsetBy: d)
swapAt(firstUnshuffled, i)
diff --git a/validation-test/Sema/type_checker_crashers_fixed/sr1512.swift b/validation-test/Sema/type_checker_crashers_fixed/sr1512.swift
index 5c49d50..518541f 100644
--- a/validation-test/Sema/type_checker_crashers_fixed/sr1512.swift
+++ b/validation-test/Sema/type_checker_crashers_fixed/sr1512.swift
@@ -32,13 +32,13 @@
public var isEmpty: Bool { return collection.isEmpty }
- public var count: C.IndexDistance { return collection.count }
+ public var count: Int { return collection.count }
public var first: C.Iterator.Element? { return collection.first }
public func index(after idx: C.Index) -> C.Index { return collection.index(after: idx) }
- public func index(_ idx: C.Index, offsetBy offset: C.IndexDistance, limitedBy limit: C.Index? = nil) -> C.Index {
+ public func index(_ idx: C.Index, offsetBy offset: Int, limitedBy limit: C.Index? = nil) -> C.Index {
return collection.index(idx, offsetBy: offset, limitedBy: limit)
}
}
diff --git a/validation-test/compiler_crashers_2_fixed/0080-rdar30442622.swift b/validation-test/compiler_crashers_2_fixed/0080-rdar30442622.swift
index 1936a94..7bfb397 100644
--- a/validation-test/compiler_crashers_2_fixed/0080-rdar30442622.swift
+++ b/validation-test/compiler_crashers_2_fixed/0080-rdar30442622.swift
@@ -1,7 +1,6 @@
// RUN: %target-swift-frontend -typecheck -primary-file %s
protocol AnyCodeUnits_ {
- typealias IndexDistance = Int64
typealias Index = Int64
typealias Element = UInt32
var startIndex: Index { get }
diff --git a/validation-test/compiler_crashers_2_fixed/0109-sr4737.swift b/validation-test/compiler_crashers_2_fixed/0109-sr4737.swift
index 29643d5..fbbb51d 100644
--- a/validation-test/compiler_crashers_2_fixed/0109-sr4737.swift
+++ b/validation-test/compiler_crashers_2_fixed/0109-sr4737.swift
@@ -134,16 +134,15 @@
extension _UIntBuffer : RandomAccessCollection {
public typealias Indices = DefaultRandomAccessIndices<_UIntBuffer>
- public typealias IndexDistance = Int
@inline(__always)
- public func index(_ i: Index, offsetBy n: IndexDistance) -> Index {
- let x = IndexDistance(i.bitOffset) &+ n &* Element.bitWidth
+ public func index(_ i: Index, offsetBy n: Int) -> Index {
+ let x = Int(i.bitOffset) &+ n &* Element.bitWidth
return Index(bitOffset: UInt8(truncatingIfNeeded: x))
}
@inline(__always)
- public func distance(from i: Index, to j: Index) -> IndexDistance {
+ public func distance(from i: Index, to j: Index) -> Int {
return (Int(j.bitOffset) &- Int(i.bitOffset)) / Element.bitWidth
}
}
@@ -218,7 +217,7 @@
_storage |= replacement1._storage &<< (headCount &* w)
_storage |= tailBits &<< ((tailOffset &+ growth) &* w)
_bitCount = UInt8(
- truncatingIfNeeded: IndexDistance(_bitCount) &+ growth &* w)
+ truncatingIfNeeded: Int(_bitCount) &+ growth &* w)
}
}
//===----------------------------------------------------------------------===//
@@ -451,13 +450,13 @@
switch d.parseOne(&more) {
case .valid(let scalarContent):
- let d: CodeUnits.IndexDistance = -numericCast(scalarContent.count)
+ let d: Int = -numericCast(scalarContent.count)
return Index(
codeUnitIndex: codeUnits.index(i.codeUnitIndex, offsetBy: d),
scalar: Encoding.ReverseDecoder.decodeOne(scalarContent),
stride: numericCast(scalarContent.count))
case .invalid(let stride):
- let d: CodeUnits.IndexDistance = -numericCast(stride)
+ let d: Int = -numericCast(stride)
return Index(
codeUnitIndex: codeUnits.index(i.codeUnitIndex, offsetBy: d) ,
scalar: UnicodeScalar(_unchecked: 0xfffd),
diff --git a/validation-test/stdlib/CollectionType.swift.gyb b/validation-test/stdlib/CollectionType.swift.gyb
index b5614df..f826161 100644
--- a/validation-test/stdlib/CollectionType.swift.gyb
+++ b/validation-test/stdlib/CollectionType.swift.gyb
@@ -848,7 +848,6 @@
iteratorType: IndexingIterator<C>.self,
subSequenceType: Slice<C>.self,
indexType: FatalIndex.self,
- indexDistanceType: Int.self,
indicesType: ${Indices}<C>.self)
}
% end
diff --git a/validation-test/stdlib/CoreAudio.swift b/validation-test/stdlib/CoreAudio.swift
index 71e9dfd..7543873 100644
--- a/validation-test/stdlib/CoreAudio.swift
+++ b/validation-test/stdlib/CoreAudio.swift
@@ -162,7 +162,6 @@
iteratorType: IndexingIterator<Subject>.self,
subSequenceType: MutableRandomAccessSlice<Subject>.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
diff --git a/validation-test/stdlib/Data.swift b/validation-test/stdlib/Data.swift
index c33777b..6c45ddc 100644
--- a/validation-test/stdlib/Data.swift
+++ b/validation-test/stdlib/Data.swift
@@ -38,7 +38,6 @@
iteratorType: Data.Iterator.self,
subSequenceType: Subject.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
diff --git a/validation-test/stdlib/Dictionary.swift b/validation-test/stdlib/Dictionary.swift
index 32d9b54..43bfd70 100644
--- a/validation-test/stdlib/Dictionary.swift
+++ b/validation-test/stdlib/Dictionary.swift
@@ -64,7 +64,6 @@
iteratorType: DictionaryIterator<MinimalHashableValue, OpaqueValue<Int>>.self,
subSequenceType: Slice<Collection>.self,
indexType: DictionaryIndex<MinimalHashableValue, OpaqueValue<Int>>.self,
- indexDistanceType: Int.self,
indicesType: DefaultIndices<Collection>.self)
}
diff --git a/validation-test/stdlib/Lazy.swift.gyb b/validation-test/stdlib/Lazy.swift.gyb
index 5aea559..58b6e57 100644
--- a/validation-test/stdlib/Lazy.swift.gyb
+++ b/validation-test/stdlib/Lazy.swift.gyb
@@ -40,7 +40,6 @@
iteratorType: IndexingIterator<Subject>.self,
subSequenceType: Slice<Subject>.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
@@ -123,7 +122,6 @@
iteratorType: IteratorOverOne<OpaqueValue<Int>>.self,
subSequenceType: Slice<Subject>.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
@@ -247,7 +245,6 @@
iteratorType: EmptyIterator<OpaqueValue<Int>>.self,
subSequenceType: Subject.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
}
@@ -878,7 +875,6 @@
iteratorType: LazyMapIterator<Base.Iterator, OpaqueValue<Int32>>.self,
subSequenceType: LazyMapCollection<Base.SubSequence, OpaqueValue<Int32>>.self,
indexType: Base.Index.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: Base.Indices.self)
}
@@ -890,7 +886,6 @@
iteratorType: LazyMapIterator<Base.Iterator, OpaqueValue<Int32>>.self,
subSequenceType: LazyMapBidirectionalCollection<Base.SubSequence, OpaqueValue<Int32>>.self,
indexType: Base.Index.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: Base.Indices.self)
}
@@ -902,7 +897,6 @@
iteratorType: LazyMapIterator<Base.Iterator, OpaqueValue<Int32>>.self,
subSequenceType: LazyMapRandomAccessCollection<Base.SubSequence, OpaqueValue<Int32>>.self,
indexType: Base.Index.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: Base.Indices.self)
}
@@ -1168,7 +1162,6 @@
iteratorType: LazyFilterIterator<Base.Iterator>.self,
subSequenceType: LazyFilterCollection<Base.SubSequence>.self,
indexType: LazyFilterIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultIndices<Subject>.self)
}
@@ -1180,7 +1173,6 @@
iteratorType: LazyFilterIterator<Base.Iterator>.self,
subSequenceType: LazyFilterBidirectionalCollection<Base.SubSequence>.self,
indexType: LazyFilterIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultBidirectionalIndices<Subject>.self)
}
@@ -1363,7 +1355,6 @@
iteratorType: LazyPrefixWhileIterator<Base.Iterator>.self,
subSequenceType: Slice<Subject>.self,
indexType: LazyPrefixWhileIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultIndices<Subject>.self)
}
@@ -1376,7 +1367,6 @@
// FIXME(ABI)#82 (Associated Types with where clauses): SubSequence should be `LazyFilterBidirectionalCollection<Base.Slice>`.
subSequenceType: Slice<Subject>.self,
indexType: LazyPrefixWhileIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultBidirectionalIndices<Subject>.self)
}
@@ -1423,7 +1413,6 @@
iteratorType: LazyDropWhileIterator<Base.Iterator>.self,
subSequenceType: Slice<Subject>.self,
indexType: LazyDropWhileIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultIndices<Subject>.self)
}
@@ -1436,7 +1425,6 @@
// FIXME(ABI)#83 (Associated Types with where clauses): SubSequence should be `LazyFilterBidirectionalCollection<Base.Slice>`.
subSequenceType: Slice<Subject>.self,
indexType: LazyDropWhileIndex<Base>.self,
- indexDistanceType: Base.IndexDistance.self,
indicesType: DefaultBidirectionalIndices<Subject>.self)
}
diff --git a/validation-test/stdlib/NewArray.swift.gyb b/validation-test/stdlib/NewArray.swift.gyb
index dc5b899..2e9d4eb 100644
--- a/validation-test/stdlib/NewArray.swift.gyb
+++ b/validation-test/stdlib/NewArray.swift.gyb
@@ -91,8 +91,7 @@
where
T.Iterator.Element == LifetimeTracked,
T.Iterator.Element == T.Element,
-T.Index == Int,
-T.IndexDistance == Int {
+T.Index == Int {
print("test: \(label)...", terminator: "")
var x: T = [
diff --git a/validation-test/stdlib/Range.swift.gyb b/validation-test/stdlib/Range.swift.gyb
index 8361851..d94930d 100644
--- a/validation-test/stdlib/Range.swift.gyb
+++ b/validation-test/stdlib/Range.swift.gyb
@@ -760,7 +760,6 @@
iteratorType: IndexingIterator<Collection>.self,
subSequenceType: Collection.self,
indexType: MinimalStrideableValue.self,
- indexDistanceType: MinimalStrideableValue.Stride.self,
indicesType: Collection.self)
}
@@ -771,7 +770,6 @@
iteratorType: IndexingIterator<Collection>.self,
subSequenceType: RandomAccessSlice<Collection>.self,
indexType: ClosedRangeIndex<MinimalStrideableValue>.self,
- indexDistanceType: MinimalStrideableValue.Stride.self,
indicesType: DefaultRandomAccessIndices<Collection>.self)
}
diff --git a/validation-test/stdlib/Set.swift b/validation-test/stdlib/Set.swift
index fcc8cdc..abf9636 100644
--- a/validation-test/stdlib/Set.swift
+++ b/validation-test/stdlib/Set.swift
@@ -318,7 +318,6 @@
iteratorType: SetIterator<MinimalHashableValue>.self,
subSequenceType: Slice<Collection>.self,
indexType: SetIndex<MinimalHashableValue>.self,
- indexDistanceType: Int.self,
indicesType: DefaultIndices<Collection>.self)
}
diff --git a/validation-test/stdlib/Slice.swift.gyb b/validation-test/stdlib/Slice.swift.gyb
index aedddef..9764dda 100644
--- a/validation-test/stdlib/Slice.swift.gyb
+++ b/validation-test/stdlib/Slice.swift.gyb
@@ -60,7 +60,6 @@
iteratorType: IndexingIterator<CollectionSlice>.self,
subSequenceType: CollectionSlice.self,
indexType: MinimalIndex.self,
- indexDistanceType: Int.self,
indicesType: Collection.Indices.self)
}
diff --git a/validation-test/stdlib/String.swift b/validation-test/stdlib/String.swift
index 28ec39f..dfc3ba5 100644
--- a/validation-test/stdlib/String.swift
+++ b/validation-test/stdlib/String.swift
@@ -66,7 +66,6 @@
iteratorType: View.Iterator.self,
subSequenceType: Substring.UTF8View.self,
indexType: View.Index.self,
- indexDistanceType: Int.self,
indicesType: DefaultBidirectionalIndices<View>.self)
}
@@ -77,7 +76,6 @@
iteratorType: IndexingIterator<View>.self,
subSequenceType: Substring.UTF16View.self,
indexType: View.Index.self,
- indexDistanceType: Int.self,
indicesType: View.Indices.self)
}
@@ -88,7 +86,6 @@
iteratorType: View.Iterator.self,
subSequenceType: Substring.UnicodeScalarView.self,
indexType: View.Index.self,
- indexDistanceType: Int.self,
indicesType: DefaultBidirectionalIndices<View>.self)
}
@@ -99,7 +96,6 @@
iteratorType: IndexingIterator<View>.self,
subSequenceType: View.self,
indexType: View.Index.self,
- indexDistanceType: Int.self,
indicesType: DefaultBidirectionalIndices<View>.self)
}
diff --git a/validation-test/stdlib/UnsafeBufferPointer.swift.gyb b/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
index c711d7e7..53c9aae 100644
--- a/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
+++ b/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
@@ -67,7 +67,6 @@
% end
subSequenceType: ${'Mutable' if IsMutable else ''}RandomAccessSlice<${SelfType}>.self,
indexType: Int.self,
- indexDistanceType: Int.self,
indicesType: CountableRange<Int>.self)
expect${'Mutable' if IsMutable else ''}CollectionType(${SelfType}.self)
