Skip to content

Commit 0c916f5

Browse files
committed
[stdlib] replace uses of String(validatingUTF8:)
- use the new name `String(validatingCString:)`
1 parent 1f0f302 commit 0c916f5

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

stdlib/private/StdlibUnittest/InspectValue.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public enum SwiftRuntime {
1616
private static func _metadataKind<T>(of value: T) -> UnsafePointer<CChar>
1717

1818
public static func metadataKind<T>(of value: T) -> String {
19-
return String(validatingUTF8: _metadataKind(of: value))!
19+
return String(validatingCString: _metadataKind(of: value))!
2020
}
2121
}
2222

stdlib/private/StdlibUnittest/StdlibUnittest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ func _printDebuggingAdvice(_ fullTestName: String) {
850850
#else
851851
let interpreter = getenv("SWIFT_INTERPRETER")
852852
if interpreter != nil {
853-
if let interpreterCmd = String(validatingUTF8: interpreter!) {
853+
if let interpreterCmd = String(validatingCString: interpreter!) {
854854
invocation.insert(interpreterCmd, at: 0)
855855
}
856856
}

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ public func spawnChild(_ args: [String])
405405
childArgs.insert(CommandLine.arguments[0], at: 0)
406406
let interpreter = getenv("SWIFT_INTERPRETER")
407407
if interpreter != nil {
408-
if let invocation = String(validatingUTF8: interpreter!) {
408+
if let invocation = String(validatingCString: interpreter!) {
409409
childArgs.insert(invocation, at: 0)
410410
}
411411
}

stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ internal func getAddressInfoForImage(atIndex i: UInt32) ->
6464
debugLog("BEGIN \(#function)"); defer { debugLog("END \(#function)") }
6565
let header = unsafeBitCast(_dyld_get_image_header(i),
6666
to: UnsafePointer<MachHeader>.self)
67-
let name = String(validatingUTF8: _dyld_get_image_name(i)!)!
67+
let name = String(validatingCString: _dyld_get_image_name(i)!)!
6868
var size: UInt = 0
6969
let address = getsegmentdata(header, "__TEXT", &size)
7070
return (name, address, size)
@@ -111,7 +111,7 @@ internal func getReflectionInfoForImage(atIndex i: UInt32) -> ReflectionInfo? {
111111
let capture = getSectionInfo("__swift5_capture", header)
112112
let typeref = getSectionInfo("__swift5_typeref", header)
113113
let reflstr = getSectionInfo("__swift5_reflstr", header)
114-
return ReflectionInfo(imageName: String(validatingUTF8: imageName)!,
114+
return ReflectionInfo(imageName: String(validatingCString: imageName)!,
115115
fieldmd: fieldmd,
116116
assocty: assocty,
117117
builtin: builtin,
@@ -160,7 +160,7 @@ internal func getReflectionInfoForImage(atIndex i: UInt32) -> ReflectionInfo? {
160160
return _getMetadataSection(UInt(i)).map { rawPointer in
161161
let name = _getMetadataSectionName(rawPointer)
162162
let metadataSection = rawPointer.bindMemory(to: MetadataSections.self, capacity: 1).pointee
163-
return ReflectionInfo(imageName: String(validatingUTF8: name)!,
163+
return ReflectionInfo(imageName: String(validatingCString: name)!,
164164
fieldmd: Section(range: metadataSection.swift5_fieldmd),
165165
assocty: Section(range: metadataSection.swift5_assocty),
166166
builtin: Section(range: metadataSection.swift5_builtin),
@@ -302,7 +302,7 @@ internal func sendReflectionInfos() {
302302
internal func printErrnoAndExit() {
303303
debugLog("BEGIN \(#function)"); defer { debugLog("END \(#function)") }
304304
let errorCString = strerror(errno)!
305-
let message = String(validatingUTF8: errorCString)! + "\n"
305+
let message = String(validatingCString: errorCString)! + "\n"
306306
let bytes = Array(message.utf8)
307307
fwrite(bytes, 1, bytes.count, stderr)
308308
fflush(stderr)

stdlib/public/Backtracing/Backtrace.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public struct Backtrace: CustomStringConvertible, Sendable {
435435
_dyld_process_info_for_each_segment(dyldInfo, machHeaderAddress) {
436436
address, size, name in
437437

438-
if let name = String(validatingUTF8: name!), name == "__TEXT" {
438+
if let name = String(validatingCString: name!), name == "__TEXT" {
439439
endOfText = address + size
440440
}
441441
}

stdlib/public/core/KeyPath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public class AnyKeyPath: Hashable, _AppendKeyPath {
196196
}
197197
guard let ptr = _kvcKeyPathStringPtr else { return nil }
198198

199-
return String(validatingUTF8: ptr)
199+
return String(validatingCString: ptr)
200200
}
201201
}
202202

stdlib/public/core/OutputStream.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ internal func _adHocPrint_unlocked<T, TargetStream: TextOutputStream>(
355355
target.write(")")
356356
case .enum:
357357
if let cString = _getEnumCaseName(value),
358-
let caseName = String(validatingUTF8: cString) {
358+
let caseName = String(validatingCString: cString) {
359359
// Write the qualified type name in debugPrint.
360360
if isDebugPrint {
361361
printTypeName(mirror.subjectType)
@@ -390,7 +390,7 @@ internal func _adHocPrint_unlocked<T, TargetStream: TextOutputStream>(
390390
} else {
391391
// Fall back to the type or an opaque summary of the kind
392392
if let cString = _opaqueSummary(mirror.subjectType),
393-
let opaqueSummary = String(validatingUTF8: cString) {
393+
let opaqueSummary = String(validatingCString: cString) {
394394
target.write(opaqueSummary)
395395
} else {
396396
target.write(_typeName(mirror.subjectType, qualified: true))
@@ -532,7 +532,7 @@ internal func _dumpPrint_unlocked<T, TargetStream: TextOutputStream>(
532532
case .`enum`:
533533
target.write(_typeName(mirror.subjectType, qualified: true))
534534
if let cString = _getEnumCaseName(value),
535-
let caseName = String(validatingUTF8: cString) {
535+
let caseName = String(validatingCString: cString) {
536536
target.write(".")
537537
target.write(caseName)
538538
}

stdlib/public/core/ReflectionMirror.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ internal func getChild<T>(of value: T, type: Any.Type, index: Int) -> (label: St
6666

6767
let value = _getChild(of: value, type: type, index: index, outName: &nameC, outFreeFunc: &freeFunc)
6868

69-
let name = nameC.flatMap({ String(validatingUTF8: $0) })
69+
let name = nameC.flatMap({ String(validatingCString: $0) })
7070
freeFunc?(nameC)
7171
return (name, value)
7272
}

0 commit comments

Comments
 (0)