Dangle result and value enum return values from Swift trait implementations.

arik-so · arik-so · commit e8f65cd77b8c · 2023-07-29T09:17:13.000-07:00
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.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/ChannelSigner.swift b/out/traits/ChannelSigner.swift
@@ -144,7 +144,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -136,7 +136,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -162,7 +162,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -194,7 +194,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -231,7 +231,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -267,7 +267,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -293,7 +293,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -319,7 +319,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -345,7 +345,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/NodeSigner.swift b/out/traits/NodeSigner.swift
@@ -104,7 +104,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -134,7 +134,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -163,7 +163,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -186,7 +186,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -115,7 +115,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -138,7 +138,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -156,7 +156,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/RoutingMessageHandler.swift b/out/traits/RoutingMessageHandler.swift
@@ -105,7 +105,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -131,7 +131,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -157,7 +157,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -238,7 +238,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -266,7 +266,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -294,7 +294,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -322,7 +322,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -350,7 +350,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/SignerProvider.swift b/out/traits/SignerProvider.swift
@@ -149,7 +149,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/UtxoLookup.swift b/out/traits/UtxoLookup.swift
@@ -90,7 +90,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/src/generation/trait_generator.mts b/src/generation/trait_generator.mts
@@ -474,7 +474,7 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
 			preparedReturnValue.wrapperPrefix = `${this.swiftTypeName(type)}(some: `;
 			preparedReturnValue.wrapperSuffix = `${instantiationContextInfixTemplate}).dangle().cType!`;
 		} else if (type instanceof RustTaggedValueEnum || type instanceof RustResult) {
-			preparedReturnValue.wrapperSuffix = '.cType!';
+			preparedReturnValue.wrapperSuffix = '.dangle().cType!';
 		} else if (type instanceof RustTrait) {
 			preparedReturnValue.wrapperSuffix = '.activate().cType!';
 		} else if (type instanceof RustStruct) {

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.cType!`
	`596`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`597`	`597`
`598`	`598`	`return returnValue`
`599`	`599`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ extension Bindings {`
`144`	`144`
`145`	`145`
`146`	`146`	`// return value (do some wrapping)`
`147`		`- let returnValue = swiftCallbackResult.cType!`
	`147`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`148`	`148`
`149`	`149`	`return returnValue`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ extension Bindings {`
`109`	`109`
`110`	`110`
`111`	`111`	`// return value (do some wrapping)`
`112`		`- let returnValue = swiftCallbackResult.cType!`
	`112`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`113`	`113`
`114`	`114`	`return returnValue`
`115`	`115`	`}`
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.cType!`
	`97`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`137`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`113`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`139`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`165`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`197`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`234`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`270`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`296`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`322`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`348`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`349`	`349`
`350`	`350`	`return returnValue`
`351`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ extension Bindings {`
`104`	`104`
`105`	`105`
`106`	`106`	`// return value (do some wrapping)`
`107`		`- let returnValue = swiftCallbackResult.cType!`
	`107`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`108`	`108`
`109`	`109`	`return returnValue`
`110`	`110`	`}`
`@@ -134,7 +134,7 @@ extension Bindings {`
`134`	`134`
`135`	`135`
`136`	`136`	`// return value (do some wrapping)`
`137`		`- let returnValue = swiftCallbackResult.cType!`
	`137`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`138`	`138`
`139`	`139`	`return returnValue`
`140`	`140`	`}`
`@@ -163,7 +163,7 @@ extension Bindings {`
`163`	`163`
`164`	`164`
`165`	`165`	`// return value (do some wrapping)`
`166`		`- let returnValue = swiftCallbackResult.cType!`
	`166`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`167`	`167`
`168`	`168`	`return returnValue`
`169`	`169`	`}`
`@@ -186,7 +186,7 @@ extension Bindings {`
`186`	`186`
`187`	`187`
`188`	`188`	`// return value (do some wrapping)`
`189`		`- let returnValue = swiftCallbackResult.cType!`
	`189`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`190`	`190`
`191`	`191`	`return returnValue`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ extension Bindings {`
`129`	`129`
`130`	`130`
`131`	`131`	`// return value (do some wrapping)`
`132`		`- let returnValue = swiftCallbackResult.cType!`
	`132`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`133`	`133`
`134`	`134`	`return returnValue`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ extension Bindings {`
`89`	`89`
`90`	`90`
`91`	`91`	`// return value (do some wrapping)`
`92`		`- let returnValue = swiftCallbackResult.cType!`
	`92`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`93`	`93`
`94`	`94`	`return returnValue`
`95`	`95`	`}`
`@@ -115,7 +115,7 @@ extension Bindings {`
`115`	`115`
`116`	`116`
`117`	`117`	`// return value (do some wrapping)`
`118`		`- let returnValue = swiftCallbackResult.cType!`
	`118`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`119`	`119`
`120`	`120`	`return returnValue`
`121`	`121`	`}`
`@@ -138,7 +138,7 @@ extension Bindings {`
`138`	`138`
`139`	`139`
`140`	`140`	`// return value (do some wrapping)`
`141`		`- let returnValue = swiftCallbackResult.cType!`
	`141`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`142`	`142`
`143`	`143`	`return returnValue`
`144`	`144`	`}`