Skip to content

Commit 233c9c4

Browse files
committed
stdlib: use existing decodeCString for initializing a String with a null-terminated C string.
And remove the now unused _SentinelCollection utility.
1 parent bfbce36 commit 233c9c4

File tree

4 files changed

+2
-150
lines changed

4 files changed

+2
-150
lines changed

stdlib/public/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ set(SWIFTLIB_ESSENTIAL
108108
Runtime.swift.gyb
109109
RuntimeFunctionCounters.swift
110110
SipHash.swift
111-
SentinelCollection.swift
112111
Sequence.swift
113112
SequenceAlgorithms.swift
114113
SequenceWrapper.swift

stdlib/public/core/GroupInfo.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
"Repeat.swift",
6464
"Sort.swift",
6565
"Range.swift",
66-
"SentinelCollection.swift",
6766
"ClosedRange.swift",
6867
"CollectionOfOne.swift",
6968
"HeapBuffer.swift",

stdlib/public/core/SentinelCollection.swift

Lines changed: 0 additions & 143 deletions
This file was deleted.

stdlib/public/core/String.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,8 @@ extension String {
231231
decodingCString nullTerminatedCodeUnits: UnsafePointer<Encoding.CodeUnit>,
232232
as sourceEncoding: Encoding.Type) {
233233

234-
let codeUnits = _SentinelCollection(
235-
UnsafeBufferPointer(_unboundedStartingAt: nullTerminatedCodeUnits),
236-
until: _IsZero()
237-
)
238-
self.init(decoding: codeUnits, as: sourceEncoding)
234+
self = String.decodeCString(
235+
nullTerminatedCodeUnits, as: sourceEncoding)!.result
239236
}
240237

241238
/// Calls the given closure with a pointer to the contents of the string,

0 commit comments

Comments
 (0)