Use recursive dangling mechanism for trait results.

arik-so · arik-so · commit 26dedf1275ff · 2023-07-30T01:32:03.000-07:00
diff --git a/out/traits/BindingsType.swift b/out/traits/BindingsType.swift
@@ -109,7 +109,7 @@ extension Bindings {
 					value: swiftCallbackResult,
 					instantiationContext: "BindingsType.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -132,7 +132,7 @@ extension Bindings {
 					array: swiftCallbackResult,
 					instantiationContext: "BindingsType.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/ChannelMessageHandler.swift b/out/traits/ChannelMessageHandler.swift
@@ -593,7 +593,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -705,7 +705,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -730,7 +730,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/ChannelSigner.swift b/out/traits/ChannelSigner.swift
@@ -90,7 +90,7 @@ extension Bindings {
 					value: swiftCallbackResult,
 					instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -113,7 +113,7 @@ extension Bindings {
 					value: swiftCallbackResult,
 					instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -144,7 +144,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -167,7 +167,7 @@ extension Bindings {
 					value: swiftCallbackResult,
 					instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/Confirm.swift b/out/traits/Confirm.swift
@@ -236,7 +236,7 @@ extension Bindings {
 				let returnValue = Vec_C2Tuple_TxidBlockHashZZ(
 					array: swiftCallbackResult, instantiationContext: "Confirm.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/CustomMessageHandler.swift b/out/traits/CustomMessageHandler.swift
@@ -109,7 +109,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -132,7 +132,7 @@ extension Bindings {
 					array: swiftCallbackResult,
 					instantiationContext: "CustomMessageHandler.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/CustomMessageReader.swift b/out/traits/CustomMessageReader.swift
@@ -94,7 +94,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/CustomOnionMessageContents.swift b/out/traits/CustomOnionMessageContents.swift
@@ -109,7 +109,7 @@ extension Bindings {
 					array: swiftCallbackResult,
 					instantiationContext: "CustomOnionMessageContents.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/CustomOnionMessageHandler.swift b/out/traits/CustomOnionMessageHandler.swift
@@ -134,7 +134,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/EcdsaChannelSigner.swift b/out/traits/EcdsaChannelSigner.swift
@@ -110,7 +110,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -136,7 +136,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -162,7 +162,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -194,7 +194,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -231,7 +231,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -267,7 +267,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -293,7 +293,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -319,7 +319,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -345,7 +345,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/EntropySource.swift b/out/traits/EntropySource.swift
@@ -88,7 +88,7 @@ extension Bindings {
 					value: swiftCallbackResult,
 					instantiationContext: "EntropySource.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/MessageSendEventsProvider.swift b/out/traits/MessageSendEventsProvider.swift
@@ -90,7 +90,7 @@ extension Bindings {
 					array: swiftCallbackResult,
 					instantiationContext: "MessageSendEventsProvider.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/NodeSigner.swift b/out/traits/NodeSigner.swift
@@ -85,7 +85,7 @@ extension Bindings {
 				let returnValue = ThirtyTwoBytes(
 					value: swiftCallbackResult, instantiationContext: "NodeSigner.swift::init()::\(#function):\(#line)"
 				)
-				.dangle().cType!
+				.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -104,7 +104,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -134,7 +134,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -163,7 +163,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -186,7 +186,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/OnionMessageHandler.swift b/out/traits/OnionMessageHandler.swift
@@ -129,7 +129,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -172,7 +172,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -197,7 +197,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/OnionMessageProvider.swift b/out/traits/OnionMessageProvider.swift
@@ -93,7 +93,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/Persister.swift b/out/traits/Persister.swift
@@ -89,7 +89,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -115,7 +115,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -138,7 +138,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/Router.swift b/out/traits/Router.swift
@@ -104,7 +104,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
@@ -156,7 +156,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.dangle().cType!
+				let returnValue = swiftCallbackResult.dangleRecursively().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/RoutingMessageHandler.swift b/out/traits/RoutingMessageHandler.swift
diff --git a/out/traits/Score.swift b/out/traits/Score.swift
diff --git a/out/traits/SignerProvider.swift b/out/traits/SignerProvider.swift
diff --git a/out/traits/UtxoLookup.swift b/out/traits/UtxoLookup.swift
diff --git a/out/traits/Watch.swift b/out/traits/Watch.swift
diff --git a/out/traits/WriteableEcdsaChannelSigner.swift b/out/traits/WriteableEcdsaChannelSigner.swift
diff --git a/out/traits/WriteableScore.swift b/out/traits/WriteableScore.swift
diff --git a/src/generation/trait_generator.mts b/src/generation/trait_generator.mts

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ extension Bindings {`
`109`	`109`	`value: swiftCallbackResult,`
`110`	`110`	`instantiationContext: "BindingsType.swift::init()::\(#function):\(#line)"`
`111`	`111`	`)`
`112`		`- .dangle().cType!`
	`112`	`+ .dangleRecursively().cType!`
`113`	`113`
`114`	`114`	`return returnValue`
`115`	`115`	`}`
`@@ -132,7 +132,7 @@ extension Bindings {`
`132`	`132`	`array: swiftCallbackResult,`
`133`	`133`	`instantiationContext: "BindingsType.swift::init()::\(#function):\(#line)"`
`134`	`134`	`)`
`135`		`- .dangle().cType!`
	`135`	`+ .dangleRecursively().cType!`
`136`	`136`
`137`	`137`	`return returnValue`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ extension Bindings {`
`593`	`593`
`594`	`594`
`595`	`595`	`// return value (do some wrapping)`
`596`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`596`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`597`	`597`
`598`	`598`	`return returnValue`
`599`	`599`	`}`
`@@ -705,7 +705,7 @@ extension Bindings {`
`705`	`705`
`706`	`706`
`707`	`707`	`// return value (do some wrapping)`
`708`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`708`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`709`	`709`
`710`	`710`	`return returnValue`
`711`	`711`	`}`
`@@ -730,7 +730,7 @@ extension Bindings {`
`730`	`730`
`731`	`731`
`732`	`732`	`// return value (do some wrapping)`
`733`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`733`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`734`	`734`
`735`	`735`	`return returnValue`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ extension Bindings {`
`90`	`90`	`value: swiftCallbackResult,`
`91`	`91`	`instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"`
`92`	`92`	`)`
`93`		`- .dangle().cType!`
	`93`	`+ .dangleRecursively().cType!`
`94`	`94`
`95`	`95`	`return returnValue`
`96`	`96`	`}`
`@@ -113,7 +113,7 @@ extension Bindings {`
`113`	`113`	`value: swiftCallbackResult,`
`114`	`114`	`instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"`
`115`	`115`	`)`
`116`		`- .dangle().cType!`
	`116`	`+ .dangleRecursively().cType!`
`117`	`117`
`118`	`118`	`return returnValue`
`119`	`119`	`}`
`@@ -144,7 +144,7 @@ extension Bindings {`
`144`	`144`
`145`	`145`
`146`	`146`	`// return value (do some wrapping)`
`147`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`147`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`148`	`148`
`149`	`149`	`return returnValue`
`150`	`150`	`}`
`@@ -167,7 +167,7 @@ extension Bindings {`
`167`	`167`	`value: swiftCallbackResult,`
`168`	`168`	`instantiationContext: "ChannelSigner.swift::init()::\(#function):\(#line)"`
`169`	`169`	`)`
`170`		`- .dangle().cType!`
	`170`	`+ .dangleRecursively().cType!`
`171`	`171`
`172`	`172`	`return returnValue`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ extension Bindings {`
`236`	`236`	`let returnValue = Vec_C2Tuple_TxidBlockHashZZ(`
`237`	`237`	`array: swiftCallbackResult, instantiationContext: "Confirm.swift::init()::\(#function):\(#line)"`
`238`	`238`	`)`
`239`		`- .dangle().cType!`
	`239`	`+ .dangleRecursively().cType!`
`240`	`240`
`241`	`241`	`return returnValue`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ extension Bindings {`
`94`	`94`
`95`	`95`
`96`	`96`	`// return value (do some wrapping)`
`97`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`97`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`98`	`98`
`99`	`99`	`return returnValue`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ extension Bindings {`
`134`	`134`
`135`	`135`
`136`	`136`	`// return value (do some wrapping)`
`137`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`137`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`138`	`138`
`139`	`139`	`return returnValue`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ extension Bindings {`
`110`	`110`
`111`	`111`
`112`	`112`	`// return value (do some wrapping)`
`113`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`113`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`114`	`114`
`115`	`115`	`return returnValue`
`116`	`116`	`}`
`@@ -136,7 +136,7 @@ extension Bindings {`
`136`	`136`
`137`	`137`
`138`	`138`	`// return value (do some wrapping)`
`139`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`139`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`140`	`140`
`141`	`141`	`return returnValue`
`142`	`142`	`}`
`@@ -162,7 +162,7 @@ extension Bindings {`
`162`	`162`
`163`	`163`
`164`	`164`	`// return value (do some wrapping)`
`165`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`165`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`166`	`166`
`167`	`167`	`return returnValue`
`168`	`168`	`}`
`@@ -194,7 +194,7 @@ extension Bindings {`
`194`	`194`
`195`	`195`
`196`	`196`	`// return value (do some wrapping)`
`197`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`197`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`198`	`198`
`199`	`199`	`return returnValue`
`200`	`200`	`}`
`@@ -231,7 +231,7 @@ extension Bindings {`
`231`	`231`
`232`	`232`
`233`	`233`	`// return value (do some wrapping)`
`234`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`234`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`235`	`235`
`236`	`236`	`return returnValue`
`237`	`237`	`}`
`@@ -267,7 +267,7 @@ extension Bindings {`
`267`	`267`
`268`	`268`
`269`	`269`	`// return value (do some wrapping)`
`270`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`270`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`271`	`271`
`272`	`272`	`return returnValue`
`273`	`273`	`}`
`@@ -293,7 +293,7 @@ extension Bindings {`
`293`	`293`
`294`	`294`
`295`	`295`	`// return value (do some wrapping)`
`296`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`296`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`297`	`297`
`298`	`298`	`return returnValue`
`299`	`299`	`}`
`@@ -319,7 +319,7 @@ extension Bindings {`
`319`	`319`
`320`	`320`
`321`	`321`	`// return value (do some wrapping)`
`322`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`322`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`323`	`323`
`324`	`324`	`return returnValue`
`325`	`325`	`}`
`@@ -345,7 +345,7 @@ extension Bindings {`
`345`	`345`
`346`	`346`
`347`	`347`	`// return value (do some wrapping)`
`348`		`- let returnValue = swiftCallbackResult.dangle().cType!`
	`348`	`+ let returnValue = swiftCallbackResult.dangleRecursively().cType!`
`349`	`349`
`350`	`350`	`return returnValue`
`351`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ extension Bindings {`
`88`	`88`	`value: swiftCallbackResult,`
`89`	`89`	`instantiationContext: "EntropySource.swift::init()::\(#function):\(#line)"`
`90`	`90`	`)`
`91`		`- .dangle().cType!`
	`91`	`+ .dangleRecursively().cType!`
`92`	`92`
`93`	`93`	`return returnValue`
`94`	`94`	`}`