Change all remaining tests that use typealias in a protocol to use associatedtype.

Author: gregomni

test/1_stdlib/BridgeStorage.swift.gyb

@@ -28,8 +28,8 @@ import Swift
 import SwiftShims
 
 protocol BridgeStorage {
-  typealias Native : AnyObject
-  typealias ObjC : AnyObject
+  associatedtype Native : AnyObject
+  associatedtype ObjC : AnyObject
 
   init(native: Native, bits: Int)
   init(native: Native)

test/1_stdlib/TypeName.swift

@@ -8,9 +8,9 @@ enum E {}
 protocol P {}
 protocol P2 {}
 protocol AssociatedTypes {
-  typealias A
-  typealias B
-  typealias C
+  associatedtype A
+  associatedtype B
+  associatedtype C
 }
 
 class Model : AssociatedTypes {

test/DebugInfo/archetype.swift

@@ -5,7 +5,7 @@ protocol IntegerArithmetic {
 }
 
 protocol RandomAccessIndex : IntegerArithmetic {
-  typealias Distance : IntegerArithmetic
+  associatedtype Distance : IntegerArithmetic
   static func uncheckedSubtract(lhs: Self, rhs: Self) -> (Distance, Bool)
 }
 

test/IDE/annotation.swift

@@ -56,13 +56,13 @@ func foo(n : Float) -> Int {
 }
 
 // CHECK-LABEL: protocol <Protocol>Prot</Protocol> {
-// CHECK-NEXT:   typealias <AssociatedType>Blarg</AssociatedType>
+// CHECK-NEXT:   associatedtype <AssociatedType>Blarg</AssociatedType>
 // CHECK-NEXT:   func <Func>protMeth</Func>(<Param>x</Param>: <iStruct@>Int</iStruct>)
 // CHECK-NEXT:   var <Var>protocolProperty1</Var>: <iStruct@>Int</iStruct> { get }
 // CHECK-NEXT:   var <Var>protocolProperty2</Var>: <iStruct@>Int</iStruct> { get set }
 // CHECK-NEXT: }
 protocol Prot {
-  typealias Blarg
+  associatedtype Blarg
   func protMeth(x: Int)
   var protocolProperty1: Int { get }
   var protocolProperty2: Int { get set }
@@ -81,7 +81,7 @@ class SubCls : MyCls, Prot {
   var protocolProperty2 = 0
 }
 
-// CHECK: func <Func>genFn</Func><<GenericTypeParam>T</GenericTypeParam> : <Protocol@64:10>Prot</Protocol> where <GenericTypeParam@85:12>T</GenericTypeParam>.<AssociatedType@65:13>Blarg</AssociatedType> : <Protocol@71:10>Prot2</Protocol>>(<Param>p</Param> : <GenericTypeParam@85:12>T</GenericTypeParam>) -> <iStruct@>Int</iStruct> {}{{$}}
+// CHECK: func <Func>genFn</Func><<GenericTypeParam>T</GenericTypeParam> : <Protocol@64:10>Prot</Protocol> where <GenericTypeParam@85:12>T</GenericTypeParam>.<AssociatedType@65:18>Blarg</AssociatedType> : <Protocol@71:10>Prot2</Protocol>>(<Param>p</Param> : <GenericTypeParam@85:12>T</GenericTypeParam>) -> <iStruct@>Int</iStruct> {}{{$}}
 func genFn<T : Prot where T.Blarg : Prot2>(p : T) -> Int {}
 
 func test(x: Int) {

test/IDE/comment_attach.swift

@@ -184,7 +184,7 @@ class decl_class_1 {
 /// decl_protocol_1 Aaa.
 protocol decl_protocol_1 {
   /// NestedTypealias Aaa.
-  typealias NestedTypealias
+  associatedtype NestedTypealias
 
   /// instanceFunc1 Aaa.
   func instanceFunc1()
@@ -293,7 +293,7 @@ func unterminatedBlockDocComment() {}
 // CHECK-NEXT: comment_attach.swift:177:15: EnumElement/decl_enum_1.Case5 RawComment=[/// Case4 Case5 Aaa.\n]
 // CHECK-NEXT: comment_attach.swift:181:7: Class/decl_class_1 RawComment=[/// decl_class_1 Aaa.\n]
 // CHECK-NEXT: comment_attach.swift:185:10: Protocol/decl_protocol_1 RawComment=[/// decl_protocol_1 Aaa.\n]
-// CHECK-NEXT: comment_attach.swift:187:13: AssociatedType/decl_protocol_1.NestedTypealias RawComment=[/// NestedTypealias Aaa.\n]
+// CHECK-NEXT: comment_attach.swift:187:18: AssociatedType/decl_protocol_1.NestedTypealias RawComment=[/// NestedTypealias Aaa.\n]
 // CHECK-NEXT: comment_attach.swift:190:8: Func/decl_protocol_1.instanceFunc1 RawComment=[/// instanceFunc1 Aaa.\n]
 // CHECK-NEXT: comment_attach.swift:193:7: Var/decl_protocol_1.propertyWithGet RawComment=[/// propertyWithGet Aaa.\n]
 // CHECK-NEXT: comment_attach.swift:193:30: Func/decl_protocol_1.<getter for decl_protocol_1.propertyWithGet> RawComment=none

test/IDE/complete_from_stdlib.swift

@@ -167,7 +167,7 @@ func testArchetypeReplacement3 (a : [Int]) {
 
 
 protocol P2 {
-  typealias MyElement
+  associatedtype MyElement
 }
 
 extension P2 {

test/IDE/complete_operators.swift

@@ -100,7 +100,7 @@ func testPostfix8(x: S) {
 // POSTFIX_8-NOT: ***
 
 protocol P {
-  typealias T
+  associatedtype T
   func foo() -> T
 }
 

test/IDE/complete_value_expr.swift

@@ -1583,7 +1583,7 @@ func testGenericConforming3<T: P3>(x: T) {
 
 struct OnlyMe {}
 protocol P4 {
-  typealias T
+  associatedtype T
 }
 extension P4 where Self.T : P1 {
   final func extP4WhenP1() {}
@@ -1724,7 +1724,7 @@ extension P4 where Self.T == WillConformP1 {
 // PROTOCOL_EXT_P4_T_DOT_1: End completions
 
 protocol PWithT {
-  typealias T
+  associatedtype T
   func foo(x: T) -> T
 }
 
@@ -1745,7 +1745,7 @@ func testUnusableProtExt(x: PWithT) {
 // PROTOCOL_EXT_UNUSABLE_EXISTENTIAL: End completions
 
 protocol dedupP {
-  typealias T
+  associatedtype T
   func foo() -> T
   var bar: T {get}
   subscript(x: T) -> T {get}

test/IRGen/associated_type_witness.swift

@@ -7,7 +7,7 @@ protocol P {}
 protocol Q {}
 
 protocol Assocked {
-  typealias Assoc : P, Q
+  associatedtype Assoc : P, Q
 }
 
 struct Universal : P, Q {}
@@ -124,7 +124,7 @@ struct Computed<T, U> : Assocked {
 
 struct PBox<T: P> {}
 protocol HasSimpleAssoc {
-  typealias Assoc
+  associatedtype Assoc
 }
 protocol DerivedFromSimpleAssoc : HasSimpleAssoc {}
 
@@ -163,7 +163,7 @@ struct GenericComputed<T: P> : DerivedFromSimpleAssoc {
 
 
 protocol HasAssocked {
-  typealias Contents : Assocked
+  associatedtype Contents : Assocked
 }
 struct FulfilledFromAssociatedType<T : HasAssocked> : HasSimpleAssoc {
   typealias Assoc = PBox<T.Contents.Assoc>

test/IRGen/dependent_reabstraction.swift

@@ -3,7 +3,7 @@
 func markUsed<T>(t: T) {}
 
 protocol A {
-  typealias B
+  associatedtype B
   func b(_: B)
 }