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

Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Max Moiseev
2016-02-15 15:43:34 -08:00
parent 55fde4c923 5869d0499b
commit 3a3984877a
741 changed files with 22676 additions and 6395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
validation-test/stdlib/Unicode.swift
View File

@@ -2143,7 +2143,7 @@ class NonContiguousNSString : NSString {
self.init(encoded)
}
@objc override func copy(zone zone: NSZone) -> AnyObject {
@objc override func copy(withZone zone: NSZone) -> AnyObject {
// Ensure that copying this string produces a class that CoreFoundation
// does not know about.
return self
@@ -2153,7 +2153,7 @@ class NonContiguousNSString : NSString {
return _value.count
}
@objc override func characterAt(index: Int) -> unichar {
@objc override func character(at index: Int) -> unichar {
return _value[index]
}
@@ -2276,7 +2276,7 @@ StringCookedViews.test("UTF8ForNonContiguousUTF16Extra") {
var bytes: [UInt8] = [ 97, 98, 99 ]
var cfstring: CFString = CFStringCreateWithBytesNoCopy(
kCFAllocatorDefault, bytes, bytes.count,
CFStringBuiltInEncodings.MacRoman.rawValue, false, kCFAllocatorNull)
CFStringBuiltInEncodings.macRoman.rawValue, false, kCFAllocatorNull)
// Sanity checks to make sure we are testing the code path that does UTF-8
// encoding itself, instead of dispatching to CF.
@@ -2299,7 +2299,7 @@ StringCookedViews.test("UTF8ForNonContiguousUTF16Extra") {
do {
var bytes: [UInt8] = [ 97, 98, 99 ]
var cfstring: CFString = CFStringCreateWithBytes(kCFAllocatorDefault,
bytes, bytes.count, CFStringBuiltInEncodings.MacRoman.rawValue, false)
bytes, bytes.count, CFStringBuiltInEncodings.macRoman.rawValue, false)
// Sanity checks to make sure we are testing the code path that does UTF-8
// encoding itself, instead of dispatching to CF.