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] API adjustments in preparation for proposal update

Browse Source
This commit is contained in:
Dave Abrahams
2017-05-09 11:19:24 -07:00
parent e7b32f9dc9
commit c64534a873
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/public/core/Substring.swift.gyb
View File

@@ -103,9 +103,9 @@ public struct Substring : StringProtocol {
% end
public init<C: Collection, Encoding: UnicodeEncoding>(
codeUnits: C, encoding: Encoding.Type
decoding codeUnits: C, as sourceEncoding: Encoding.Type
) where C.Iterator.Element == Encoding.CodeUnit {
self.init(String(codeUnits: codeUnits, encoding: encoding))
self.init(String(decoding: codeUnits, as: sourceEncoding))
}
public init(cString nulTerminatedUTF8: UnsafePointer<CChar>) {
@@ -119,9 +119,11 @@ public struct Substring : StringProtocol {
/// - Parameter encoding: describes the encoding in which the code units
/// should be interpreted.
public init<Encoding: UnicodeEncoding>(
cString nulTerminatedCodeUnits: UnsafePointer<Encoding.CodeUnit>,
encoding: Encoding.Type) {
self.init(String(cString: nulTerminatedCodeUnits, encoding: encoding))
decodingCString nulTerminatedCodeUnits: UnsafePointer<Encoding.CodeUnit>,
as targetEncoding: Encoding.Type
) {
self.init(
String(decodingCString: nulTerminatedCodeUnits, as: targetEncoding))
}
/// Invokes the given closure on the contents of the string, represented as a
@@ -140,7 +142,7 @@ public struct Substring : StringProtocol {
/// Invokes the given closure on the contents of the string, represented as a
/// pointer to a null-terminated sequence of code units in the given encoding.
public func withCString<Result, TargetEncoding: UnicodeEncoding>(
encoding targetEncoding: TargetEncoding.Type,
encodedAs targetEncoding: TargetEncoding.Type,
_ body: (UnsafePointer<TargetEncoding.CodeUnit>) throws -> Result
) rethrows -> Result {
return try _slice._base._core._withCSubstring(