Skip to content

Commit 98fc0a9

Browse files
authored
Merge pull request #80326 from benrimmington/span
[stdlib] Update element constraints of `Span`
2 parents 115b2b7 + 2f9f5ff commit 98fc0a9

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

stdlib/public/core/Span/Span.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ import Swift
2525
@frozen
2626
@safe
2727
@available(SwiftStdlib 6.2, *)
28-
public struct Span<Element: ~Copyable & ~Escapable>
29-
: ~Escapable, Copyable, BitwiseCopyable {
28+
public struct Span<Element: ~Copyable>: ~Escapable, Copyable, BitwiseCopyable {
3029

3130
/// The starting address of this `Span`.
3231
///
@@ -167,7 +166,7 @@ extension Span where Element: ~Copyable {
167166
}
168167

169168
@available(SwiftStdlib 6.2, *)
170-
extension Span {
169+
extension Span /*where Element: Copyable*/ {
171170

172171
/// Unsafely create a `Span` over initialized memory.
173172
///
@@ -376,7 +375,7 @@ extension Span where Element: BitwiseCopyable {
376375
}
377376

378377
@available(SwiftStdlib 6.2, *)
379-
extension Span where Element: ~Copyable & ~Escapable {
378+
extension Span where Element: ~Copyable {
380379

381380
/// The number of elements in the span.
382381
///

test/abi/macOS/arm64/stdlib.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -794,13 +794,13 @@ Added: _$sSS5IndexVs28CustomDebugStringConvertiblesWP
794794
// SE-0447 Span and RawSpan
795795
Added: _$ss4SpanVMa
796796
Added: _$ss4SpanVMn
797-
Added: _$ss4SpanVsRi_zRi0_zrlE6_countSivg
798-
Added: _$ss4SpanVsRi_zRi0_zrlE6_countSivpMV
799-
Added: _$ss4SpanVsRi_zRi0_zrlE8_pointerSVSgvg
800-
Added: _$ss4SpanVsRi_zRi0_zrlE8_pointerSVSgvpMV
801-
Added: _$ss4SpanVsRi_zRi0_zrlE5countSivpMV
802-
Added: _$ss4SpanVsRi_zRi0_zrlE7indicesSnySiGvpMV
803-
Added: _$ss4SpanVsRi_zRi0_zrlE7isEmptySbvpMV
797+
Added: _$ss4SpanVsRi_zrlE6_countSivg
798+
Added: _$ss4SpanVsRi_zrlE6_countSivpMV
799+
Added: _$ss4SpanVsRi_zrlE8_pointerSVSgvg
800+
Added: _$ss4SpanVsRi_zrlE8_pointerSVSgvpMV
801+
Added: _$ss4SpanVsRi_zrlE5countSivpMV
802+
Added: _$ss4SpanVsRi_zrlE7indicesSnySiGvpMV
803+
Added: _$ss4SpanVsRi_zrlE7isEmptySbvpMV
804804
Added: _$ss4SpanVss15BitwiseCopyableRzlE9uncheckedxSi_tcipMV
805805
Added: _$ss4SpanVss15BitwiseCopyableRzlEyxSicipMV
806806
Added: _$ss7RawSpanV11byteOffsetsSnySiGvpMV

test/abi/macOS/x86_64/stdlib.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,13 @@ Added: _$sSS5IndexVs28CustomDebugStringConvertiblesWP
795795
// SE-0447 Span and RawSpan
796796
Added: _$ss4SpanVMa
797797
Added: _$ss4SpanVMn
798-
Added: _$ss4SpanVsRi_zRi0_zrlE6_countSivg
799-
Added: _$ss4SpanVsRi_zRi0_zrlE6_countSivpMV
800-
Added: _$ss4SpanVsRi_zRi0_zrlE8_pointerSVSgvg
801-
Added: _$ss4SpanVsRi_zRi0_zrlE8_pointerSVSgvpMV
802-
Added: _$ss4SpanVsRi_zRi0_zrlE5countSivpMV
803-
Added: _$ss4SpanVsRi_zRi0_zrlE7indicesSnySiGvpMV
804-
Added: _$ss4SpanVsRi_zRi0_zrlE7isEmptySbvpMV
798+
Added: _$ss4SpanVsRi_zrlE6_countSivg
799+
Added: _$ss4SpanVsRi_zrlE6_countSivpMV
800+
Added: _$ss4SpanVsRi_zrlE8_pointerSVSgvg
801+
Added: _$ss4SpanVsRi_zrlE8_pointerSVSgvpMV
802+
Added: _$ss4SpanVsRi_zrlE5countSivpMV
803+
Added: _$ss4SpanVsRi_zrlE7indicesSnySiGvpMV
804+
Added: _$ss4SpanVsRi_zrlE7isEmptySbvpMV
805805
Added: _$ss4SpanVss15BitwiseCopyableRzlE9uncheckedxSi_tcipMV
806806
Added: _$ss4SpanVss15BitwiseCopyableRzlEyxSicipMV
807807
Added: _$ss7RawSpanV11byteOffsetsSnySiGvpMV

0 commit comments

Comments
 (0)