_ArrayType => _ArrayProtocol

swiftlang · Dec 16, 2015 · db84df9 · db84df9
1 parent ca932fc
commit db84df9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/stdlib/public/core/ArrayType.swift b/stdlib/public/core/ArrayType.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 public // @testable
-protocol _ArrayType
+protocol _ArrayProtocol
   : RangeReplaceableCollection,
     ArrayLiteralConvertible
 {
@@ -80,8 +80,8 @@ protocol _ArrayType
   var _buffer: _Buffer {get}
 }
 
-internal struct _ArrayTypeMirror<
-  T : _ArrayType where T.Index == Int
+internal struct _ArrayProtocolMirror<
+  T : _ArrayProtocol where T.Index == Int
 > : _MirrorType {
   let _value : T
 

diff --git a/stdlib/public/core/Arrays.swift.gyb b/stdlib/public/core/Arrays.swift.gyb
@@ -488,7 +488,7 @@ public func _deallocateUninitialized${Self}<Element>(
 }
 %end
 
-extension ${Self} : _ArrayType {
+extension ${Self} : _ArrayProtocol {
   /// Construct an empty ${Self}.
   @_semantics("array.init")
   public init() {
@@ -774,7 +774,7 @@ extension ${Self} : _Reflectable {
   /// Returns a mirror that reflects `self`.
   @warn_unused_result
   public func _getMirror() -> _MirrorType {
-    return _ArrayTypeMirror(self)
+    return _ArrayProtocolMirror(self)
   }
 }
 

diff --git a/stdlib/public/core/Collection.swift b/stdlib/public/core/Collection.swift
@@ -566,7 +566,7 @@ extension Collection
 }
 
 extension Sequence
-  where Self : _ArrayType, Self.Element == Self.Iterator.Element {
+  where Self : _ArrayProtocol, Self.Element == Self.Iterator.Element {
   // A fast implementation for when you are backed by a contiguous array.
   public func _initializeTo(ptr: UnsafeMutablePointer<Iterator.Element>)
     -> UnsafeMutablePointer<Iterator.Element> {

diff --git a/test/1_stdlib/NewArray.swift.gyb b/test/1_stdlib/NewArray.swift.gyb
@@ -81,11 +81,11 @@ func printSequence<T : Sequence>(x: T) {
 
 typealias BufferID = UnsafePointer<Void>
 
-func bufferID<T : _ArrayType>(x: T) -> BufferID {
+func bufferID<T : _ArrayProtocol>(x: T) -> BufferID {
   return x._buffer.identity
 }
 
-func checkReallocation<T : _ArrayType>(
+func checkReallocation<T : _ArrayProtocol>(
   x: T, _ lastBuffer: BufferID, _ reallocationExpected: Bool
 ) -> BufferID {
   let currentBuffer = bufferID(x)
@@ -109,7 +109,7 @@ func checkEqual<
 }
 
 func test<
-  T : _ArrayType
+  T : _ArrayProtocol
   where
   T.Iterator.Element == T._Buffer.Element,
   T._Buffer.Element == T.Element,