Gardening: Migrate test suite to GH issues: type

Author: AnthonyLatsis

test/type/array.swift

@@ -114,14 +114,15 @@ func passAssocType<T : HasAssocType>(_ t: T) {
   takesAssocType(t, [T.A](), [T.A?]())
 }
 
-// SR-11134
-
-let sr_11134_1 = [[1, 2, 3][0]] // ok
-let sr_11134_2 = [[1, 2, 3] [1]] // expected-warning {{unexpected subscript in array literal; did you mean to write two separate elements instead?}}
-// expected-note@-1 {{add a separator between the elements}}{{28-28=,}}
-// expected-note@-2 {{remove the space between the elements to silence this warning}}{{28-29=}}
-let sr_11134_3 = [
-  [1, 2, 3] [1] // expected-warning {{unexpected subscript in array literal; did you mean to write two separate elements instead?}}
-// expected-note@-1 {{add a separator between the elements}}{{12-12=,}}
-// expected-note@-2 {{remove the space between the elements to silence this warning}}{{12-13=}}
-]
+// https://github.com/apple/swift/issues/53530
+do {
+  let _ = [[1, 2, 3][0]] // ok
+  let _ = [[1, 2, 3] [1]] // expected-warning {{unexpected subscript in array literal; did you mean to write two separate elements instead?}}
+  // expected-note@-1 {{add a separator between the elements}}{{21-21=,}}
+  // expected-note@-2 {{remove the space between the elements to silence this warning}}{{21-22=}}
+  let _ = [
+    [1, 2, 3] [1] // expected-warning {{unexpected subscript in array literal; did you mean to write two separate elements instead?}}
+  // expected-note@-1 {{add a separator between the elements}}{{14-14=,}}
+  // expected-note@-2 {{remove the space between the elements to silence this warning}}{{14-15=}}
+  ]
+}

test/type/opaque.swift

@@ -537,12 +537,14 @@ func test_diagnostic_with_contextual_generic_params() {
   }
 }
 
-// SR-10988 - Suggest `return` when the last statement of a multi-statement function body would be a valid return value
+// https://github.com/apple/swift/issues/53378
+// Suggest `return` when the last statement of a multi-statement function body
+// would be a valid return value
 protocol P1 {
 }
 protocol P2 {
 }
-func sr10988() {
+do {
   func test() -> some Numeric {
     // expected-error@-1 {{function declares an opaque return type, but has no return statements in its body from which to infer an underlying type}}
     let x = 0

test/type/parameterized_protocol.swift

@@ -89,8 +89,9 @@ protocol SequenceWrapperProtocol {
   associatedtype E
 }
 
-// https://bugs.swift.org/browse/SR-15979 - the GenericSignatureBuilder doesn't like this protocol.
-
+// https://github.com/apple/swift/issues/58240
+// the GenericSignatureBuilder doesn't like this protocol.
+//
 // CHECK-LABEL: .Recursive@
 // CHECK-NEXT: Requirement signature: <Self where Self.[Recursive]B == Self.[Recursive]D.[Recursive]B, Self.[Recursive]C == Self.[Recursive]D.[Recursive]C, Self.[Recursive]D : Recursive>
 protocol Recursive<B, C> {

test/type/protocol_composition.swift

@@ -160,10 +160,11 @@ struct S03: Optional<P5> & P6 {} // expected-error {{non-protocol, non-class typ
 struct S04<T : P5 & (P6)> {}
 struct S05<T> where T : P5? & P6 {} // expected-error {{non-protocol, non-class type '(any P5)?' cannot be used within a protocol-constrained type}}
 
-// SR-3124 - Protocol Composition Often Migrated Incorrectly
-struct S3124<T: protocol<P1, P3>> {} // expected-error {{'protocol<...>' composition syntax has been removed; join the protocols using '&'}} {{17-34=P1 & P3>}}
-func f3124_1<U where U: protocol<P1, P3>>(x: U)  {} // expected-error {{'protocol<...>' composition syntax has been removed; join the protocols using '&'}} {{25-42=P1 & P3>}} // expected-error {{'where' clause}}
-func f3124_2<U : protocol<P1>>(x: U)  {} // expected-error {{'protocol<...>' composition syntax has been removed and is not needed here}} {{18-31=P1>}}
+// https://github.com/apple/swift/issues/45712
+// Protocol Composition Often Migrated Incorrectly
+struct S_45712<T: protocol<P1, P3>> {} // expected-error {{'protocol<...>' composition syntax has been removed; join the protocols using '&'}} {{19-36=P1 & P3>}}
+func f1_45712<U where U: protocol<P1, P3>>(_: U)  {} // expected-error {{'protocol<...>' composition syntax has been removed; join the protocols using '&'}} {{26-43=P1 & P3>}} // expected-error {{'where' clause}}
+func f2_45712<U : protocol<P1>>(_: U)  {} // expected-error {{'protocol<...>' composition syntax has been removed and is not needed here}} {{19-32=P1>}}
 
 // Make sure we correctly form compositions in expression context
 func takesP1AndP2(_: [AnyObject & P1 & P2]) {}

test/type/protocol_types.swift

@@ -96,7 +96,7 @@ func testHasAssoc(_ x: Any, _: HasAssoc) { // expected-error {{use of protocol '
   }
 }
 
-// SR-38
+// https://github.com/apple/swift/issues/42661
 var b: HasAssoc // expected-error {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}
 
 // Further generic constraint error testing - typealias used inside statements

test/type/self.swift

@@ -26,7 +26,7 @@ extension X.Inner {
   func foo(_ other: Self) { }
 }
 
-// SR-695
+// https://github.com/apple/swift/issues/43310
 class Mario {
   func getFriend() -> Self { return self } // expected-note{{overridden declaration is here}}
   func getEnemy() -> Mario { return self }
@@ -259,7 +259,8 @@ class Foo {
   }()
 }
 
-// https://bugs.swift.org/browse/SR-11681 - duplicate diagnostics
+// https://github.com/apple/swift/issues/54090 (duplicate diagnostics)
+
 struct Box<T> {
   let boxed: T
 }
@@ -268,6 +269,7 @@ class Boxer {
   lazy var s = Box<Self>(boxed: self as! Self)
   // expected-error@-1 {{stored property cannot have covariant 'Self' type}}
   // expected-error@-2 {{mutable property cannot have covariant 'Self' type}}
+  // FIXME: [DiagQoI] We can do better than this.
 
   var t = Box<Self>(boxed: Self())
   // expected-error@-1 {{stored property cannot have covariant 'Self' type}}
@@ -276,7 +278,8 @@ class Boxer {
   required init() {}
 }
 
-// https://bugs.swift.org/browse/SR-12133 - a type named 'Self' should be found first
+// https://github.com/apple/swift/issues/54568
+// A type named 'Self' should be found first
 struct OuterType {
   struct `Self` {
     let string: String
@@ -361,7 +364,8 @@ do {
   }
 }
 
-// https://bugs.swift.org/browse/SR-14731
+// https://github.com/apple/swift/issues/57081
+
 struct Generic<T> {
   func foo() -> Self<Int> {}
   // expected-error@-1 {{cannot specialize 'Self'}}

test/type/types.swift

@@ -186,10 +186,12 @@ let _ : inout @convention(c) (Int) -> Int // expected-error {{'inout' may only b
 func foo3(inout a: Int -> Void) {} // expected-error {{'inout' before a parameter name is not allowed, place it before the parameter type instead}} {{11-16=}} {{20-20=inout }}
                                    // expected-error @-1 {{single argument function types require parentheses}} {{20-20=(}} {{23-23=)}}
 
-func sr5505(arg: Int) -> String {
-  return "hello"
+// https://github.com/apple/swift/issues/48077
+do {
+  func imAFunction(arg: Int) -> String {}
+  var _: imAFunction = imAFunction
+  // expected-error@-1 {{cannot find type 'imAFunction' in scope}}
 }
-var _: sr5505 = sr5505 // expected-error {{cannot find type 'sr5505' in scope}}
 
 typealias A = (inout Int ..., Int ... = [42, 12]) -> Void // expected-error {{'inout' must not be used on variadic parameters}}
                                                           // expected-error@-1 {{only a single element can be variadic}} {{35-39=}}