Gardening: Migrate test suite to GH issues: expr/closure

Author: AnthonyLatsis

test/expr/closure/closures.swift

@@ -513,26 +513,24 @@ let closure = {
   return helper
 }
 
-// SR-9839
-func SR9839(_ x: @escaping @convention(block) () -> Void) {}
+// https://github.com/apple/swift/issues/52253
+do {
+  func f(_: @escaping @convention(block) () -> Void) {}
 
-func id<T>(_ x: T) -> T {
-  return x
-}
+  func id<T>(_: T) -> T {}
 
-var qux: () -> Void = {}
+  let qux: () -> Void
 
-SR9839(qux)
-SR9839(id(qux)) // expected-error {{conflicting arguments to generic parameter 'T' ('() -> Void' vs. '@convention(block) () -> Void')}}
+  f(qux)
+  f(id(qux)) // expected-error {{conflicting arguments to generic parameter 'T' ('() -> Void' vs. '@convention(block) () -> Void')}}
 
-func forceUnwrap<T>(_ x: T?) -> T {
-  return x!
-}
+  func forceUnwrap<T>(_: T?) -> T {}
 
-var qux1: (() -> Void)? = {}
+  let qux1: (() -> Void)?
 
-SR9839(qux1!)
-SR9839(forceUnwrap(qux1))
+  f(qux1!)
+  f(forceUnwrap(qux1))
+}
 
 // rdar://problem/65155671 - crash referencing parameter of outer closure
 func rdar65155671(x: Int) {
@@ -541,21 +539,22 @@ func rdar65155671(x: Int) {
     }(x)
 }
 
-func sr3186<T, U>(_ f: (@escaping (@escaping (T) -> U) -> ((T) -> U))) -> ((T) -> U) {
-    return { x in return f(sr3186(f))(x) }
-}
+// https://github.com/apple/swift/issues/45774
+do {
+  func f<T, U>(_: (@escaping (@escaping (T) -> U) -> ((T) -> U))) -> ((T) -> U) {}
 
-class SR3186 {
-  init() {
-    // expected-warning@+1{{capture 'self' was never used}}
-    let v = sr3186 { f in { [unowned self, f] x in x != 1000 ? f(x + 1) : "success" } }(0)
-    print("\(v)")
+  class C {
+    init() {
+      // expected-warning@+1{{capture 'self' was never used}}
+      let _ = f { fn in { [unowned self, fn] x in x != 1000 ? fn(x + 1) : "success" } }(0)
+    }
   }
 }
 
+// https://github.com/apple/swift/issues/56501
 // Apply the explicit 'self' rule even if it refers to a capture, if
-// we're inside a nested closure
-class SR14120 {
+// we're inside a nested closure.
+class C_56501 {
   func operation() {}
 
   func test1() {
@@ -613,24 +612,25 @@ class SR14120 {
   }
 }
 
-// SR-14678
-func call<T>(_ : Int, _ f: () -> (T, Int)) -> (T, Int) {
-  f()
-}
+// https://github.com/apple/swift/issues/57029
+do {
+  func call<T>(_ : Int, _ f: () -> (T, Int)) -> (T, Int) {}
 
-func testSR14678() -> (Int, Int) {
-  call(1) { // expected-error {{cannot convert return expression of type '((), Int)' to return type '(Int, Int)'}}
-     (print("hello"), 0)
+  func f() -> (Int, Int) {
+    call(1) { // expected-error {{cannot convert return expression of type '((), Int)' to return type '(Int, Int)'}}
+       ((), 0)
+    }
   }
-}
 
-func testSR14678_Optional() -> (Int, Int)? {
-  call(1) { // expected-error {{cannot convert return expression of type '((), Int)' to return type '(Int, Int)'}}
-     (print("hello"), 0)
+  func f_Optional() -> (Int, Int)? {
+    call(1) { // expected-error {{cannot convert return expression of type '((), Int)' to return type '(Int, Int)'}}
+       ((), 0)
+    }
   }
 }
 
-// SR-13239
+// https://github.com/apple/swift/issues/55680
+
 func callit<T>(_ f: () -> T) -> T {
   f()
 }
@@ -655,61 +655,61 @@ func callitVariadic<T>(_ fs: () -> T...) -> T {
   fs.first!()
 }
 
-func testSR13239_Tuple() -> Int {
+func test_55680_Tuple() -> Int {
   // expected-error@+2{{conflicting arguments to generic parameter 'T' ('()' vs. 'Int')}}
   // expected-note@+1:3{{generic parameter 'T' inferred as 'Int' from context}}
   callitTuple(1) { // expected-note@:18{{generic parameter 'T' inferred as '()' from closure return expression}}
     (print("hello"), 0) 
   }
 }
 
-func testSR13239() -> Int {
+func test_55680() -> Int {
   // expected-error@+2{{conflicting arguments to generic parameter 'T' ('()' vs. 'Int')}}
   // expected-note@+1:3{{generic parameter 'T' inferred as 'Int' from context}}
   callit { // expected-note@:10{{generic parameter 'T' inferred as '()' from closure return expression}}
     print("hello")
   }
 }
 
-func testSR13239_Args() -> Int {
+func test_55680_Args() -> Int {
   // expected-error@+2{{conflicting arguments to generic parameter 'T' ('()' vs. 'Int')}}
   // expected-note@+1:3{{generic parameter 'T' inferred as 'Int' from context}}
   callitArgs(1) { // expected-note@:17{{generic parameter 'T' inferred as '()' from closure return expression}}
     print("hello") 
   }
 }
 
-func testSR13239_ArgsFn() -> Int {
+func test_55680_ArgsFn() -> Int {
   // expected-error@+2{{conflicting arguments to generic parameter 'T' ('()' vs. 'Int')}}
   // expected-note@+1:3{{generic parameter 'T' inferred as 'Int' from context}}
   callitArgsFn(1) { // expected-note@:19{{generic parameter 'T' inferred as '()' from closure return expression}}
     { print("hello") } 
   }
 }
 
-func testSR13239MultiExpr() -> Int {
+func test_55680_MultiExpr() -> Int {
   callit {
     print("hello") 
     return print("hello") // expected-error {{cannot convert return expression of type '()' to return type 'Int'}}
   }
 }
 
-func testSR13239_GenericArg() -> Int {
+func test_55680_GenericArg() -> Int {
   // Generic argument is inferred as Int from first argument literal, so no conflict in this case.
   callitGenericArg(1) {
     print("hello") // expected-error {{cannot convert value of type '()' to closure result type 'Int'}}
   }
 }
 
-func testSR13239_Variadic() -> Int {
+func test_55680_Variadic() -> Int {
   // expected-error@+2{{conflicting arguments to generic parameter 'T' ('()' vs. 'Int')}}
   // expected-note@+1:3{{generic parameter 'T' inferred as 'Int' from context}}
   callitVariadic({ // expected-note@:18{{generic parameter 'T' inferred as '()' from closure return expression}}
     print("hello")
   })
 }
 
-func testSR13239_Variadic_Twos() -> Int {
+func test_55680_Variadic_Twos() -> Int {
   // expected-error@+1{{cannot convert return expression of type '()' to return type 'Int'}}
   callitVariadic({
     print("hello")

test/expr/closure/closures_swift6.swift

@@ -12,7 +12,8 @@ class ExplicitSelfRequiredTest {
   }
 }
 
-class SR14120 {
+// https://github.com/apple/swift/issues/56501
+class C_56501 {
   func operation() {}
 
   func test1() {

test/expr/closure/inference.swift

@@ -38,43 +38,42 @@ var nestedClosuresWithBrokenInference = { f: Int in {} }
     // expected-error@-2 {{expected expression}}
     // expected-error@-3 {{cannot find 'f' in scope}}
 
-// SR-11540
-
-func SR11540<R>(action: () -> R) -> Void {}
-
-func SR11540<T, R>(action: (T) -> R) -> Void {}
+// https://github.com/apple/swift/issues/53941
+do {
+  func f1<R>(action: () -> R) -> Void {}
 
-func SR11540_1<T, R>(action: (T) -> R) -> Void {} 
+  func f1<T, R>(action: (T) -> R) -> Void {}
 
-SR11540(action: { return }) // Ok SR11540<R>(action: () -> R) was the selected overload.
+  func f2<T, R>(action: (T) -> R) -> Void {}
 
-// In case that's the only possible overload, it's acceptable
-SR11540_1(action: { return }) // OK
+  f1(action: { return }) // Ok f1<R>(action: () -> R) was the selected overload.
 
-// SR-8563
-func SR8563<A,Z>(_ f: @escaping (A) -> Z) -> (A) -> Z {
-    return f
+  // In case that's the only possible overload, it's acceptable
+  f2(action: { return }) // OK
 }
 
-func SR8563<A,B,Z>(_ f: @escaping (A, B) -> Z) -> (A, B) -> Z {
-    return f
-}
+// https://github.com/apple/swift/issues/51081
+do {
+  func f1<A,Z>(_ f: @escaping (A) -> Z) -> (A) -> Z {}
+
+  func f1<A,B,Z>(_ f: @escaping (A, B) -> Z) -> (A, B) -> Z {}
 
-let aa = SR8563 { (a: Int) in }
-let bb = SR8563 { (a1: Int, a2: String) in } // expected-note {{'bb' declared here}}
+  let aa = f1 { (a: Int) in }
+  let bb = f1 { (a1: Int, a2: String) in } // expected-note {{'bb' declared here}}
 
-aa(1) // Ok
-bb(1, "2") // Ok
-bb(1) // expected-error {{missing argument for parameter #2 in call}}
+  aa(1) // Ok
+  bb(1, "2") // Ok
+  bb(1) // expected-error {{missing argument for parameter #2 in call}}
 
-// Tuple
-let cc = SR8563 { (_: (Int)) in }
+  // Tuple
+  let cc = f1 { (_: (Int)) in }
 
-cc((1)) // Ok
-cc(1) // Ok
+  cc((1)) // Ok
+  cc(1) // Ok
+}
 
-// SR-12955
-func SR12955() {
+// https://github.com/apple/swift/issues/55401
+do {
   let f: @convention(c) (T) -> Void // expected-error {{cannot find type 'T' in scope}}
 }
 

test/expr/closure/single_expr.swift

@@ -100,7 +100,7 @@ let backupPlan: () -> Int = { haltAndCatchFire() }
 func missionCritical(storage: () -> String) {}
 missionCritical(storage: { haltAndCatchFire() })
 
-// <https://bugs.swift.org/browse/SR-4963>
+// https://github.com/apple/swift/issues/47540
 enum E { }
 func takesAnotherUninhabitedType(e: () -> E) {}
 takesAnotherUninhabitedType { haltAndCatchFire() }

test/expr/closure/single_expr_ifdecl.swift

@@ -177,7 +177,7 @@ missionCritical(storage: {
   #endif
 })
 
-// <https://bugs.swift.org/browse/SR-4963>
+// https://github.com/apple/swift/issues/47540
 enum E { }
 func takesAnotherUninhabitedType(e: () -> E) {}
 takesAnotherUninhabitedType {

test/expr/closure/trailing.swift

@@ -39,7 +39,8 @@ func notPostfix() {
 }
 
 func notLiterals() {
-  struct SR3671 { // <https://bugs.swift.org/browse/SR-3671>
+  // https://github.com/apple/swift/issues/46256
+  struct S {
     var v: Int = 1 { // expected-error {{variable with getter/setter cannot have an initial value}}
       get {
         return self.v
@@ -218,10 +219,12 @@ func r23036383(foo: Foo23036383?, obj: Foo23036383) {
   if let _ = (foo?.map {$0+1}.map({$0+1})).map({$0+1}) {} // OK
 }
 
+// https://github.com/apple/swift/issues/51245
+
 func id<T>(fn: () -> T) -> T { return fn() }
 func any<T>(fn: () -> T) -> Any { return fn() }
 
-func testSR8736() {
+func test_51245() {
   if !id { true } { return } // expected-warning {{trailing closure in this context is confusable with the body of the statement; pass as a parenthesized argument to silence this warning}}
 
   if id { true } == true { return } // expected-warning {{trailing closure in this context is confusable with the body of the statement; pass as a parenthesized argument to silence this warning}}