[Migrator] Re-enable wrap_optional.swift test.

rudkx · kitasuke · commit 2a6f58d4d656 · 2018-06-08T12:47:01.000-07:00
This had to be reworked a bit to deal with the fact that IUOs are no
longer a distinct type and there were uses of IUOs that are not
supported after SE-0054.

Fixes: rdar://problem/37040141
diff --git a/test/Migrator/Inputs/API.json b/test/Migrator/Inputs/API.json
@@ -253,7 +253,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "ImplicitOptionalToOptional",
     "ChildIndex": "1",
-    "LeftUsr": "s:6CitiesAAC7yandina1xySQySays10DictionaryVySSABGGG_tF",
+    "LeftUsr": "s:6CitiesAAC7yandina1xySays10DictionaryVySSABGGSg_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -264,7 +264,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "TypeRewritten",
     "ChildIndex": "1:0:0:0",
-    "LeftUsr": "s:6CitiesAAC7yandina1xySQySays10DictionaryVySSABGGG_tF",
+    "LeftUsr": "s:6CitiesAAC7yandina1xySays10DictionaryVySSABGGSg_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "Int",
@@ -341,7 +341,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "WrapOptional",
     "ChildIndex": "1",
-    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySQySSGSSSg_SStXE_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -352,7 +352,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "WrapOptional",
     "ChildIndex": "1",
-    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySQySSGSSSg_SStXE_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -363,7 +363,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "ImplicitOptionalToOptional",
     "ChildIndex": "1:0",
-    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySQySSGSSSg_SStXE_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -374,7 +374,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "UnwrapOptional",
     "ChildIndex": "1:1:0",
-    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySQySSGSSSg_SStXE_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -385,7 +385,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "ImplicitOptionalToOptional",
     "ChildIndex": "1",
-    "LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySQySi_Si_SittG_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySi_Si_SittSg_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -396,7 +396,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "WrapOptional",
     "ChildIndex": "1:0:1:0",
-    "LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySQySi_Si_SittG_tF",
+    "LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySi_Si_SittSg_tF",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
@@ -429,7 +429,7 @@
     "NodeKind": "Function",
     "NodeAnnotation": "ImplicitOptionalToOptional",
     "ChildIndex": "0",
-    "LeftUsr": "s:6CitiesAAC1ySQyABGSi_tcfc",
+    "LeftUsr": "s:6CitiesAAC1yABSgSi_tcfc",
     "LeftComment": "",
     "RightUsr": "",
     "RightComment": "",
diff --git a/test/Migrator/Inputs/Cities.swift b/test/Migrator/Inputs/Cities.swift
@@ -16,7 +16,7 @@ open class Cities {
 
 public protocol ExtraCities {
   func coolum(x: [String : [Int : [(((String))?)]]])
-  func blibli(x: (String?, String) -> String!)
+  func blibli(x: (String?, String) -> String?)
   func currimundi(x: (Int, (Int, Int))!)
 }
 
diff --git a/test/Migrator/wrap_optional.swift b/test/Migrator/wrap_optional.swift
@@ -1,6 +1,4 @@
 // REQUIRES: objc_interop
-// FIXME: Disable until we deal with IUO being removed as a type
-// REQUIRES: rdar37040141
 // RUN: %empty-directory(%t.mod)
 // RUN: %target-swift-frontend -emit-module -o %t.mod/Cities.swiftmodule %S/Inputs/Cities.swift -module-name Cities -parse-as-library
 // RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -disable-migrator-fixits -primary-file %s  -I %t.mod -api-diff-data-file %S/Inputs/API.json -emit-migrated-file-path %t/wrap_optional.swift.result -o /dev/null
@@ -33,13 +31,13 @@ extension ExtraCities {
 }
 
 class MyExtraCities : ExtraCities {
-  func blibli(x: (String?, String) -> String!) {}
+  func blibli(x: (String?, String) -> String?) {}
   func currimundi(x: (Int, (Int, Int))!) {}
 }
 
 typealias IntAnd<T> = (Int, T)
 class Outer {
-  typealias Inner = (String?, String) -> String!
+  typealias Inner = (String?, String) -> String?
 }
 
 class MyExtraCitiesWithAliases : ExtraCities {
@@ -48,9 +46,9 @@ class MyExtraCitiesWithAliases : ExtraCities {
 }
 
 typealias OptString = String?
-typealias ImplicitlyUnwrapped<T> = T!
+typealias OptGeneric<T> = T?
 
 class MyExtraCitiesWithMoreAliases : ExtraCities {
-  func blibli(x: (OptString, String) -> String!) {}
-  func currimundi(x: ImplicitlyUnwrapped<(Int, (Int, Int))>) {}
+  func blibli(x: (OptString, String) -> String?) {}
+  func currimundi(x: OptGeneric<(Int, (Int, Int))>) {}
 }
diff --git a/test/Migrator/wrap_optional.swift.expected b/test/Migrator/wrap_optional.swift.expected
@@ -37,7 +37,7 @@ class MyExtraCities : ExtraCities {
 
 typealias IntAnd<T> = (Int, T)
 class Outer {
-  typealias Inner = (String?, String) -> String!
+  typealias Inner = (String?, String) -> String?
 }
 
 class MyExtraCitiesWithAliases : ExtraCities {
@@ -46,9 +46,9 @@ class MyExtraCitiesWithAliases : ExtraCities {
 }
 
 typealias OptString = String?
-typealias ImplicitlyUnwrapped<T> = T!
+typealias OptGeneric<T> = T?
 
 class MyExtraCitiesWithMoreAliases : ExtraCities {
   func blibli(x: ((OptString, String) -> String?)?) {}
-  func currimundi(x: ImplicitlyUnwrapped<(Int, (Int, Int))>) {}
+  func currimundi(x: OptGeneric<(Int, (Int, Int))>) {}
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ open class Cities {`
`16`	`16`
`17`	`17`	`public protocol ExtraCities {`
`18`	`18`	`func coolum(x: [String : [Int : [(((String))?)]]])`
`19`		`- func blibli(x: (String?, String) -> String!)`
	`19`	`+ func blibli(x: (String?, String) -> String?)`
`20`	`20`	`func currimundi(x: (Int, (Int, Int))!)`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`// REQUIRES: objc_interop`
`2`		`-// FIXME: Disable until we deal with IUO being removed as a type`
`3`		`-// REQUIRES: rdar37040141`
`4`	`2`	`// RUN: %empty-directory(%t.mod)`
`5`	`3`	`// RUN: %target-swift-frontend -emit-module -o %t.mod/Cities.swiftmodule %S/Inputs/Cities.swift -module-name Cities -parse-as-library`
`6`	`4`	`// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -disable-migrator-fixits -primary-file %s -I %t.mod -api-diff-data-file %S/Inputs/API.json -emit-migrated-file-path %t/wrap_optional.swift.result -o /dev/null`
`@@ -33,13 +31,13 @@ extension ExtraCities {`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`class MyExtraCities : ExtraCities {`
`36`		`- func blibli(x: (String?, String) -> String!) {}`
	`34`	`+ func blibli(x: (String?, String) -> String?) {}`
`37`	`35`	`func currimundi(x: (Int, (Int, Int))!) {}`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`typealias IntAnd<T> = (Int, T)`
`41`	`39`	`class Outer {`
`42`		`- typealias Inner = (String?, String) -> String!`
	`40`	`+ typealias Inner = (String?, String) -> String?`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`class MyExtraCitiesWithAliases : ExtraCities {`
`@@ -48,9 +46,9 @@ class MyExtraCitiesWithAliases : ExtraCities {`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`typealias OptString = String?`
`51`		`-typealias ImplicitlyUnwrapped<T> = T!`
	`49`	`+typealias OptGeneric<T> = T?`
`52`	`50`
`53`	`51`	`class MyExtraCitiesWithMoreAliases : ExtraCities {`
`54`		`- func blibli(x: (OptString, String) -> String!) {}`
`55`		`- func currimundi(x: ImplicitlyUnwrapped<(Int, (Int, Int))>) {}`
	`52`	`+ func blibli(x: (OptString, String) -> String?) {}`
	`53`	`+ func currimundi(x: OptGeneric<(Int, (Int, Int))>) {}`
`56`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class MyExtraCities : ExtraCities {`
`37`	`37`
`38`	`38`	`typealias IntAnd<T> = (Int, T)`
`39`	`39`	`class Outer {`
`40`		`- typealias Inner = (String?, String) -> String!`
	`40`	`+ typealias Inner = (String?, String) -> String?`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`class MyExtraCitiesWithAliases : ExtraCities {`
`@@ -46,9 +46,9 @@ class MyExtraCitiesWithAliases : ExtraCities {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`typealias OptString = String?`
`49`		`-typealias ImplicitlyUnwrapped<T> = T!`
	`49`	`+typealias OptGeneric<T> = T?`
`50`	`50`
`51`	`51`	`class MyExtraCitiesWithMoreAliases : ExtraCities {`
`52`	`52`	`func blibli(x: ((OptString, String) -> String?)?) {}`
`53`		`- func currimundi(x: ImplicitlyUnwrapped<(Int, (Int, Int))>) {}`
	`53`	`+ func currimundi(x: OptGeneric<(Int, (Int, Int))>) {}`
`54`	`54`	`}`