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

Update master to build with Xcode 8 beta 1, OS X 10.12, iOS 10, tvOS 10, and watchOS 3 SDKs.

Browse Source
This commit is contained in:
Mishal Shah
2016-06-14 13:37:34 -07:00
parent b84f1d8f9b
commit 87b7bcfd3e
257 changed files with 19510 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
validation-test/stdlib/UnicodeUTFEncoders.swift
View File

@@ -13,13 +13,13 @@ import Foundation
protocol TestableUnicodeCodec : UnicodeCodec {
associatedtype CodeUnit : Integer
static func encodingId() -> NSStringEncoding
static func encodingId() -> String.Encoding
static func name() -> NSString
}
extension UTF8 : TestableUnicodeCodec {
static func encodingId() -> NSStringEncoding {
return NSUTF8StringEncoding
static func encodingId() -> String.Encoding {
return .utf8
}
static func name() -> NSString {
return "UTF8"
@@ -27,8 +27,8 @@ extension UTF8 : TestableUnicodeCodec {
}
extension UTF16 : TestableUnicodeCodec {
static func encodingId() -> NSStringEncoding {
return NSUTF16LittleEndianStringEncoding
static func encodingId() -> String.Encoding {
return .utf16LittleEndian
}
static func name() -> NSString {
return "UTF16"
@@ -36,8 +36,8 @@ extension UTF16 : TestableUnicodeCodec {
}
extension UTF32 : TestableUnicodeCodec {
static func encodingId() -> NSStringEncoding {
return NSUTF32LittleEndianStringEncoding
static func encodingId() -> String.Encoding {
return .utf32LittleEndian
}
static func name() -> NSString {
return "UTF32"
@@ -69,7 +69,7 @@ func nthUnicodeScalar(_ n: UInt32) -> UnicodeScalar {
// `buffer` should have a length >= 4
func nsEncode<CodeUnit>(
_ c: UInt32,
_ encoding: NSStringEncoding,
_ encoding: String.Encoding,
_ buffer: inout [CodeUnit],
_ used: inout Int
) {
@@ -79,13 +79,13 @@ func nsEncode<CodeUnit>(
let s = NSString(
bytes: &c,
length: 4,
encoding: NSUTF32LittleEndianStringEncoding)!
encoding: String.Encoding.utf32LittleEndian.rawValue)!
s.getBytes(
&buffer,
maxLength: buffer.count,
usedLength: &used,
encoding: encoding,
encoding: encoding.rawValue,
options: [],
range: NSRange(location: 0, length: s.length),
remaining: nil)