Skip to content

Commit 5fcccf4

Browse files
committed
Revert "[temporary] disable spans over inline elements"
This reverts commit 7b03593.
1 parent c21de06 commit 5fcccf4

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

stdlib/public/core/CollectionOfOne.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ extension CollectionOfOne {
168168
get {
169169
let pointer = unsafe UnsafePointer<Element>(Builtin.addressOfBorrow(self))
170170
let span = unsafe Span(_unsafeStart: pointer, count: 1)
171-
fatalError("Span over CollectionOfOne is not supported yet.")
172171
return unsafe _overrideLifetime(span, borrowing: self)
173172
}
174173
}

stdlib/public/core/InlineArray.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ extension InlineArray where Element: ~Copyable {
470470
borrowing get {
471471
let pointer = _address
472472
let span = unsafe Span(_unsafeStart: pointer, count: count)
473-
fatalError("Span over InlineArray is not supported yet.")
474473
return unsafe _overrideLifetime(span, borrowing: self)
475474
}
476475
}

test/stdlib/Span/InlineSpanProperties.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ var suite = TestSuite("Span properties backed by inline storage")
2323
defer { runAllTests() }
2424

2525
suite.test("CollectionOfOne.span property")
26-
.skip(.wasiAny(reason: "Trap tests aren't supported on WASI."))
2726
.skip(.custom(
2827
{ if #available(SwiftStdlib 6.2, *) { false } else { true } },
2928
reason: "Requires Swift 6.2's standard library"
@@ -35,15 +34,13 @@ suite.test("CollectionOfOne.span property")
3534
let u = Array(s.utf8)
3635
let c = CollectionOfOne(consume s)
3736
s = ""
38-
expectCrashLater()
3937
let span = c.span
4038
expectEqual(span.count, 1)
4139
let v = Array(span[0].utf8)
4240
expectEqual(u, v)
4341
}
4442

4543
suite.test("CollectionOfOne.span property (simple)")
46-
.skip(.wasiAny(reason: "Trap tests aren't supported on WASI."))
4744
.skip(.custom(
4845
{ if #available(SwiftStdlib 6.2, *) { false } else { true } },
4946
reason: "Requires Swift 6.2's standard library"
@@ -52,7 +49,6 @@ suite.test("CollectionOfOne.span property (simple)")
5249
guard #available(SwiftStdlib 6.2, *) else { return }
5350

5451
let c = CollectionOfOne(Int.random(in: 0..<100000))
55-
expectCrashLater()
5652
let span = c.span
5753
expectEqual(span.count, c.indices.count)
5854
expectEqual(span[0], c[0])
@@ -63,7 +59,6 @@ struct Padded: BitwiseCopyable {
6359
}
6460

6561
suite.test("CollectionOfOne.span stride test")
66-
.skip(.wasiAny(reason: "Trap tests aren't supported on WASI."))
6762
.skip(.custom(
6863
{ if #available(SwiftStdlib 6.2, *) { false } else { true } },
6964
reason: "Requires Swift 6.2's standard library"
@@ -72,14 +67,12 @@ suite.test("CollectionOfOne.span stride test")
7267
guard #available(SwiftStdlib 6.2, *) else { return }
7368

7469
let c = CollectionOfOne(Padded(storage: (-1, 1)))
75-
expectCrashLater()
7670
let span = c.span
7771
let bytes = span.bytes
7872
expectEqual(bytes.byteCount, MemoryLayout.size(ofValue: c))
7973
}
8074

8175
suite.test("InlineArray.span property")
82-
.skip(.wasiAny(reason: "Trap tests aren't supported on WASI."))
8376
.skip(.custom(
8477
{ if #available(SwiftStdlib 6.2, *) { false } else { true } },
8578
reason: "Requires Swift 6.2's standard library"
@@ -89,7 +82,6 @@ suite.test("InlineArray.span property")
8982

9083
var s = InlineArray<5, Int>(repeating: 0)
9184
s[3] = .random(in: 0..<1000)
92-
expectCrashLater()
9385
let span = s.span
9486
expectEqual(span.count, s.count)
9587
for i in s.indices {
@@ -98,7 +90,6 @@ suite.test("InlineArray.span property")
9890
}
9991

10092
suite.test("InlineArray.span property (String)")
101-
.skip(.wasiAny(reason: "Trap tests aren't supported on WASI."))
10293
.skip(.custom(
10394
{ if #available(SwiftStdlib 6.2, *) { false } else { true } },
10495
reason: "Requires Swift 6.2's standard library"
@@ -108,7 +99,6 @@ suite.test("InlineArray.span property (String)")
10899

109100
var s = InlineArray<5, String>(repeating: "0")
110101
s[3] = String(Int.random(in: 0..<1000))
111-
expectCrashLater()
112102
let span = s.span
113103
expectEqual(span.count, s.count)
114104
for i in s.indices {

0 commit comments

Comments
 (0)