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:
Dmitri Gribenko
2016-02-17 14:40:05 -08:00
parent 0e1c488f9a b480ab1f5f
commit dd75aed67a
450 changed files with 8406 additions and 5202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
validation-test/stdlib/ArrayNew.swift.gyb
View File

@@ -729,8 +729,8 @@ class CustomImmutableNSArray : NSArray {
fatalError("init(coder:) not implemented by CustomImmutableNSArray")
}
@objc
override func copy(withZone zone: NSZone) -> AnyObject {
@objc(copyWithZone:)
override func copy(with zone: NSZone) -> AnyObject {
++CustomImmutableNSArray.timesCopyWithZoneWasCalled
return self
}
@@ -1060,7 +1060,7 @@ ArrayTestSuite.test("BridgedToObjC/Verbatim/getObjects") {
ArrayTestSuite.test("BridgedToObjC/Verbatim/copyWithZone") {
let a = getBridgedNSArrayOfRefTypeVerbatimBridged(numElements: 3)
let copy: AnyObject = a.copy(withZone: nil)
let copy: AnyObject = a.copy(with: nil)
expectEqual(
unsafeBitCast(a, to: UInt.self), unsafeBitCast(copy, to: UInt.self))
}
@@ -1334,7 +1334,7 @@ ArrayTestSuite.test("BridgedToObjC/Custom/getObjects") {
ArrayTestSuite.test("BridgedToObjC/Custom/copyWithZone") {
let a = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 3)
let copy: AnyObject = a.copy(withZone: nil)
let copy: AnyObject = a.copy(with: nil)
expectEqual(
unsafeBitCast(a, to: UInt.self),
unsafeBitCast(copy, to: UInt.self))