averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stdlib] remove most uses of _asCChar and _asUInt8

Browse Source
This commit is contained in:
Guillaume Lessard
2022-04-06 15:21:00 -06:00
parent 8032a7c0c9
commit 8379b2422a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stdlib/public/core/CString.swift
View File

@@ -45,8 +45,9 @@ extension String {
/// - Parameter nullTerminatedUTF8: A pointer to a null-terminated UTF-8 code sequence.
public init(cString nullTerminatedUTF8: UnsafePointer<CChar>) {
let len = UTF8._nullCodeUnitOffset(in: nullTerminatedUTF8)
self = String._fromUTF8Repairing(
UnsafeBufferPointer(start: nullTerminatedUTF8._asUInt8, count: len)).0
self = nullTerminatedUTF8.withMemoryRebound(to: UInt8.self, capacity: len) {
String._fromUTF8Repairing(UnsafeBufferPointer(start: $0, count: len)).0
}
}
@inlinable
@@ -150,8 +151,9 @@ extension String {
/// - Parameter cString: A pointer to a null-terminated UTF-8 code sequence.
public init?(validatingUTF8 cString: UnsafePointer<CChar>) {
let len = UTF8._nullCodeUnitOffset(in: cString)
guard let str = String._tryFromUTF8(
UnsafeBufferPointer(start: cString._asUInt8, count: len))
guard let str = cString.withMemoryRebound(to: UInt8.self, capacity: len, {
String._tryFromUTF8(UnsafeBufferPointer(start: $0, count: len))
})
else { return nil }
self = str
@@ -165,9 +167,10 @@ extension String {
"input of String.init(validatingUTF8:) must be null-terminated"
)
}
guard let string = cString.prefix(length).withUnsafeBytes({
String._tryFromUTF8($0.assumingMemoryBound(to: UInt8.self))
}) else { return nil }
guard let string = cString.prefix(length).withUnsafeBufferPointer({
$0.withMemoryRebound(to: UInt8.self, String._tryFromUTF8(_:))
})
else { return nil }
self = string
}

3
stdlib/public/core/StringGuts.swift
View File

@@ -167,8 +167,7 @@ extension _StringGuts {
_ f: (UnsafeBufferPointer<CChar>) throws -> R
) rethrows -> R {
return try self.withFastUTF8 { utf8 in
let ptr = utf8.baseAddress._unsafelyUnwrappedUnchecked._asCChar
return try f(UnsafeBufferPointer(start: ptr, count: utf8.count))
return try utf8.withMemoryRebound(to: CChar.self, f)
}
}
}