Fix the swift demangler tests

diff --git a/test/db/formats/mangling/swift b/test/db/formats/mangling/swift
index c0383e8b0e2ab04b947299ecd5cccca22ca8c066..9a2c9274ba6c3287c09567ea535b7fd0e225c072 100644 (file)
--- a/test/db/formats/mangling/swift
+++ b/test/db/formats/mangling/swift
@@ -12,7 +12,7 @@ CMDS=<<EOF
 iD swift _$s13PasswordCheck11ContentViewV4bodyQrvg7SwiftUI05TupleD0VyAE0D0PAEE7paddingyQrAE4EdgeO3SetV_12CoreGraphics7CGFloatVSgtFQOyAE4TextV_Qo__AiEEAJyQrAN_ARtFQOyAiEE14textFieldStyleyQrqd__AE0oqR0Rd__lFQOyAE06SecureQ0VyATG_AE013RoundedBorderoqR0VQo__Qo_AiEE5alert11isPresented7contentQrAE7BindingVySbG_AE5AlertVyXEtFQOyAE6ButtonVyAiEE12cornerRadius_11antialiasedQrAQ_SbtFQOyAiEE15foregroundColoryQrAE5ColorVSgFQOyAiEE10background_20ignoresSafeAreaEdgesQrqd___ANtAE05ShapeR0Rd__lFQOyAU_A17_Qo__Qo__Qo_G_Qo_tGyXEfU_yycfU_
 EOF
 EXPECT=<<EOF
-PasswordCheck.ContentView.body.SwiftUI.Tuple...D0VyAE0D0PAEE7paddingyQrAE4EdgeO3SetV_12CoreGraphics7CGFloatVSgtFQOyAE4TextV_Qo__AiEEAJyQrAN_ARtFQOyAiEE14textFieldStyleyQrqd__AE0oqR0Rd__lFQOyAE06SecureQ0VyATG_AE013RoundedBorderoqR0VQo__Qo_AiEE5alert11isPresented7contentQrAE7BindingVySbG_AE5AlertVyXEtFQOyAE6ButtonVyAiEE12cornerRadius_11antialiasedQrAQ_SbtFQOyAiEE15foregroundColoryQrAE5ColorVSgFQOyAiEE10background_20ignoresSafeAreaEdgesQrqd___ANtAE05ShapeR0Rd__lFQOyAU_A17_Qo__Qo__Qo_G_Qo_tGyXEfU_yycfU_
+closure #1 () -> () in closure #1 () -> SwiftUI.TupleView<(<<opaque return type of (extension in SwiftUI):SwiftUI.View.padding(SwiftUI.Edge.Set, Swift.Optional<CoreGraphics.CGFloat>) -> some>>.0, <<opaque return type of (extension in SwiftUI):SwiftUI.View.padding(SwiftUI.Edge.Set, Swift.Optional<CoreGraphics.CGFloat>) -> some>>.0, <<opaque return type of (extension in SwiftUI):SwiftUI.View.alert(isPresented: SwiftUI.Binding<Swift.Bool>, content: () -> SwiftUI.Alert) -> some>>.0)> in PasswordCheck.ContentView.body.getter : some
 EOF
 RUN
 
@@ -24,9 +24,9 @@ iD swift _$s10HomeWallet0A12FileProviderC013getContentsOfC04with4type10Foundatio
 iD swift _$s10HomeWallet0A13DeeplinkModelV6pageIdSSSgvpfi
 EOF
 EXPECT=<<EOF
-HomeWallet.DeeplinkModel.launchIDFA(...SgvM)
-HomeWallet.FileProvider.getContentsOf.with.type__String(...tF)
-HomeWallet.DeeplinkModel.pageId(...Sgvpfi)
+HomeWallet.HomeDeeplinkModel.launchIDFA.modify : Swift.Optional<Swift.String>
+HomeWallet.HomeFileProvider.getContentsOfFile(with: Swift.String, type: Swift.String) -> Swift.Optional<Foundation.Data>
+variable initialization expression of HomeWallet.HomeDeeplinkModel.pageId : Swift.Optional<Swift.String>
 EOF
 RUN
 
@@ -36,7 +36,7 @@ CMDS=<<EOF
 iD swift _$s10CartFacade0aB13ModalItemViewC14moreItemsLabelSo7UILabelCSgvgTq
 EOF
 EXPECT=<<EOF
-CartFacade: ', ModalItemView.moreItemsLabel: ', C.more.UILabel(...gvgTq)
+method descriptor for CartFacade.CartFacadeModalItemView.moreItemsLabel.getter : Swift.Optional<__C.UILabel>
 EOF
 RUN
 
@@ -46,7 +46,7 @@ CMDS=<<EOF
 iD swift $s9CryptoKit4P384O12KeyAgreementO07PrivateD0V20compactRepresentableAGSb_tcfC
 EOF
 EXPECT=<<EOF
-CryptoKit.P384.KeyAgreement.Private(...cfC)
+CryptoKit.P384.KeyAgreement.PrivateKey.init(compactRepresentable: Swift.Bool) -> CryptoKit.P384.KeyAgreement.PrivateKey
 EOF
 RUN
 
@@ -81,7 +81,7 @@ NAME=swift long multiple dupes
 FILE=--
 CMDS=iD swift $s9CryptoKit8Curve448O7SigningO9PublicKeyV17rawRepresentationAGx_tKc10Foundation15ContiguousBytesRzlufC
 EXPECT=<<EOF
-CryptoKit.Curve448.Signing.PublicKey.rawRepresentation.Foundation.ContiguousBytes(...lufC)
+CryptoKit.Curve448.Signing.PublicKey.init<A where A: Foundation.ContiguousBytes>(rawRepresentation: A) throws -> CryptoKit.Curve448.Signing.PublicKey
 EOF
 RUN