Skip to content

Commit 07b846d

Browse files
committed
make unsafeUninitializedCapacity initializers use typed throws
1 parent 40e372f commit 07b846d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

stdlib/public/core/Array.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,12 +1512,12 @@ extension Array {
15121512
/// Implementation for Array(unsafeUninitializedCapacity:initializingWith:)
15131513
/// and ContiguousArray(unsafeUninitializedCapacity:initializingWith:)
15141514
@inlinable
1515-
internal init(
1515+
internal init<E>(
15161516
_unsafeUninitializedCapacity: Int,
15171517
initializingWith initializer: (
15181518
_ buffer: inout UnsafeMutableBufferPointer<Element>,
1519-
_ initializedCount: inout Int) throws -> Void
1520-
) rethrows {
1519+
_ initializedCount: inout Int) throws(E) -> Void
1520+
) throws(E) {
15211521
var firstElementAddress: UnsafeMutablePointer<Element>
15221522
unsafe (self, firstElementAddress) =
15231523
unsafe Array._allocateUninitialized(_unsafeUninitializedCapacity)
@@ -1567,12 +1567,12 @@ extension Array {
15671567
/// which begins as zero. Set `initializedCount` to the number of
15681568
/// elements you initialize.
15691569
@_alwaysEmitIntoClient @inlinable
1570-
public init(
1570+
public init<E>(
15711571
unsafeUninitializedCapacity: Int,
15721572
initializingWith initializer: (
15731573
_ buffer: inout UnsafeMutableBufferPointer<Element>,
1574-
_ initializedCount: inout Int) throws -> Void
1575-
) rethrows {
1574+
_ initializedCount: inout Int) throws(E) -> Void
1575+
) throws(E) {
15761576
self = try unsafe Array(
15771577
_unsafeUninitializedCapacity: unsafeUninitializedCapacity,
15781578
initializingWith: initializer)

stdlib/public/core/ContiguousArray.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,12 +1105,12 @@ extension ContiguousArray {
11051105
/// which begins as zero. Set `initializedCount` to the number of
11061106
/// elements you initialize.
11071107
@_alwaysEmitIntoClient @inlinable
1108-
public init(
1108+
public init<E>(
11091109
unsafeUninitializedCapacity: Int,
11101110
initializingWith initializer: (
11111111
_ buffer: inout UnsafeMutableBufferPointer<Element>,
1112-
_ initializedCount: inout Int) throws -> Void
1113-
) rethrows {
1112+
_ initializedCount: inout Int) throws(E) -> Void
1113+
) throws(E) {
11141114
self = try unsafe ContiguousArray(Array(
11151115
_unsafeUninitializedCapacity: unsafeUninitializedCapacity,
11161116
initializingWith: initializer))

0 commit comments

Comments
 (0)