Merge remote-tracking branch 'origin/master' into swift-3-indexing-model

This commit is contained in:
Dmitri Gribenko
2016-03-09 20:51:38 -08:00
607 changed files with 18933 additions and 9900 deletions

View File

@@ -2551,7 +2551,7 @@ final internal class _Native${Self}StorageOwner<${TypeParametersDecl}>
@objc(copyWithZone:)
@warn_unused_result
internal func copy(withZone zone: _SwiftNSZone) -> AnyObject {
internal func copy(with zone: _SwiftNSZone) -> AnyObject {
// Instances of this class should be visible outside of standard library as
// having `NSSet` type, which is immutable.
return self
@@ -2588,7 +2588,7 @@ final internal class _Native${Self}StorageOwner<${TypeParametersDecl}>
@objc(copyWithZone:)
@warn_unused_result
internal func copy(withZone zone: _SwiftNSZone) -> AnyObject {
internal func copy(with zone: _SwiftNSZone) -> AnyObject {
// Instances of this class should be visible outside of standard library as
// having `NSDictionary` type, which is immutable.
return self