mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Protocol names end in "Type," "ible," or "able"
Mechanically add "Type" to the end of any protocol names that don't end in "Type," "ible," or "able." Also, drop "Type" from the end of any associated type names, except for those of the *LiteralConvertible protocols. There are obvious improvements to make in some of these names, which can be handled with separate commits. Fixes <rdar://problem/17165920> Protocols `Integer` etc should get uglier names. Swift SVN r19883
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// _NSSwiftArray supplies the implementation of the _CocoaArray API
|
||||
// _NSSwiftArray supplies the implementation of the _CocoaArrayType API
|
||||
// (and thus, NSArray the API) for our _ContiguousArrayStorage<T>. We
|
||||
// can't put this implementation directly on _ContiguousArrayStorage
|
||||
// because generic classes can't override Objective-C selectors.
|
||||
@@ -22,7 +22,7 @@ import SwiftShims
|
||||
// Base class of the heap buffer implementation backing the new Array
|
||||
// design.
|
||||
@objc internal
|
||||
class _NSSwiftArray : HeapBufferStorageBase, _CocoaArray {
|
||||
class _NSSwiftArray : HeapBufferStorageBase, _CocoaArrayType {
|
||||
typealias Buffer = HeapBuffer<_ArrayBody, AnyObject>
|
||||
|
||||
func canStoreElementsOfDynamicType(_: Any.Type) -> Bool {
|
||||
@@ -72,7 +72,7 @@ class _NSSwiftArray : HeapBufferStorageBase, _CocoaArray {
|
||||
}
|
||||
}
|
||||
|
||||
func copyWithZone(_: COpaquePointer) -> _CocoaArray {
|
||||
func copyWithZone(_: COpaquePointer) -> _CocoaArrayType {
|
||||
return self
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user