Skip to content

Commit 455d139

Browse files
committed
stdlib: remove _extractOrCopyToContiguousArray()
1 parent 824bccc commit 455d139

File tree

1 file changed

+6
-27
lines changed

1 file changed

+6
-27
lines changed

stdlib/public/core/Arrays.swift.gyb

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ extension ${Self} : ArrayLiteralConvertible {
936936
///
937937
/// - Parameter elements: A variadic list of elements of the new array.
938938
public init(arrayLiteral elements: Element...) {
939-
self.init(_buffer: _extractOrCopyToContiguousArray(elements._buffer)._buffer)
939+
self.init(_buffer: ContiguousArray(elements)._buffer)
940940
}
941941
%end
942942
}
@@ -1428,7 +1428,10 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
14281428
}
14291429

14301430
public func _copyToContiguousArray() -> ContiguousArray<Element> {
1431-
return _extractOrCopyToContiguousArray(self._buffer)
1431+
if let n = _buffer.requestNativeBuffer() {
1432+
return ContiguousArray(_buffer: n)
1433+
}
1434+
return _copyCollectionToContiguousArray(_buffer)
14321435
}
14331436
}
14341437

@@ -1488,10 +1491,9 @@ extension ${Self} {
14881491
if _fastPath(p != nil || isEmpty) {
14891492
return (_owner, UnsafePointer(p))
14901493
}
1491-
let n = _extractOrCopyToNativeArrayBuffer(self._buffer)
1494+
let n = ContiguousArray(self._buffer)._buffer
14921495
return (n.owner, UnsafePointer(n.firstElementAddress))
14931496
}
1494-
14951497
}
14961498

14971499
extension ${Self} {
@@ -1977,29 +1979,6 @@ internal func _arrayReserve<_Buffer>(
19771979
_arrayOutOfPlaceUpdate(&buffer, &newBuffer, count, 0, _IgnorePointer())
19781980
}
19791981

1980-
internal func _extractOrCopyToContiguousArray<Buffer>(
1981-
_ source: Buffer
1982-
) -> ContiguousArray<Buffer.Iterator.Element>
1983-
where
1984-
Buffer : _ArrayBufferProtocol,
1985-
Buffer.Iterator.Element == Buffer.Element {
1986-
1987-
if let n = source.requestNativeBuffer() {
1988-
return ContiguousArray(_buffer: n)
1989-
}
1990-
return _copyCollectionToContiguousArray(source)
1991-
}
1992-
1993-
internal func _extractOrCopyToNativeArrayBuffer<Buffer>(
1994-
_ source: Buffer
1995-
) -> _ContiguousArrayBuffer<Buffer.Iterator.Element>
1996-
where
1997-
Buffer : _ArrayBufferProtocol,
1998-
Buffer.Iterator.Element == Buffer.Element {
1999-
2000-
return _extractOrCopyToContiguousArray(source)._buffer
2001-
}
2002-
20031982
/// Append items from `newItems` to `buffer`.
20041983
internal func _arrayAppendSequence<Buffer, S>(
20051984
_ buffer: inout Buffer, _ newItems: S

0 commit comments

Comments
 (0)