Dangle struct return values from Swift trait implementations.

arik-so · arik-so · commit 3cbfc3590e49 · 2023-07-29T10:03:03.000-07:00
diff --git a/out/traits/ChannelMessageHandler.swift b/out/traits/ChannelMessageHandler.swift
@@ -705,7 +705,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -730,7 +730,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
@@ -172,7 +172,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -197,7 +197,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().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.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
diff --git a/out/traits/RoutingMessageHandler.swift b/out/traits/RoutingMessageHandler.swift
@@ -206,7 +206,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -388,7 +388,7 @@ extension Bindings {
 
 
 				// return value (do some wrapping)
-				let returnValue = swiftCallbackResult.cType!
+				let returnValue = swiftCallbackResult.dangle().cType!
 
 				return returnValue
 			}
@@ -413,7 +413,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
@@ -191,7 +191,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
@@ -478,7 +478,7 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
 		} else if (type instanceof RustTrait) {
 			preparedReturnValue.wrapperSuffix = '.activate().cType!';
 		} else if (type instanceof RustStruct) {
-			preparedReturnValue.wrapperSuffix = '.cType!';
+			preparedReturnValue.wrapperSuffix = '.dangle().cType!';
 		} else if (type instanceof RustPrimitive) {
 			// nothing to do here
 		} else if (type instanceof RustPrimitiveEnum) {

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ extension Bindings {`
`705`	`705`
`706`	`706`
`707`	`707`	`// return value (do some wrapping)`
`708`		`- let returnValue = swiftCallbackResult.cType!`
	`708`	`+ let returnValue = swiftCallbackResult.dangle().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.cType!`
	`733`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`734`	`734`
`735`	`735`	`return returnValue`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ extension Bindings {`
`172`	`172`
`173`	`173`
`174`	`174`	`// return value (do some wrapping)`
`175`		`- let returnValue = swiftCallbackResult.cType!`
	`175`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`176`	`176`
`177`	`177`	`return returnValue`
`178`	`178`	`}`
`@@ -197,7 +197,7 @@ extension Bindings {`
`197`	`197`
`198`	`198`
`199`	`199`	`// return value (do some wrapping)`
`200`		`- let returnValue = swiftCallbackResult.cType!`
	`200`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`201`	`201`
`202`	`202`	`return returnValue`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ extension Bindings {`
`93`	`93`
`94`	`94`
`95`	`95`	`// return value (do some wrapping)`
`96`		`- let returnValue = swiftCallbackResult.cType!`
	`96`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`97`	`97`
`98`	`98`	`return returnValue`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ extension Bindings {`
`206`	`206`
`207`	`207`
`208`	`208`	`// return value (do some wrapping)`
`209`		`- let returnValue = swiftCallbackResult.cType!`
	`209`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`210`	`210`
`211`	`211`	`return returnValue`
`212`	`212`	`}`
`@@ -388,7 +388,7 @@ extension Bindings {`
`388`	`388`
`389`	`389`
`390`	`390`	`// return value (do some wrapping)`
`391`		`- let returnValue = swiftCallbackResult.cType!`
	`391`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`392`	`392`
`393`	`393`	`return returnValue`
`394`	`394`	`}`
`@@ -413,7 +413,7 @@ extension Bindings {`
`413`	`413`
`414`	`414`
`415`	`415`	`// return value (do some wrapping)`
`416`		`- let returnValue = swiftCallbackResult.cType!`
	`416`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`417`	`417`
`418`	`418`	`return returnValue`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ extension Bindings {`
`191`	`191`
`192`	`192`
`193`	`193`	`// return value (do some wrapping)`
`194`		`- let returnValue = swiftCallbackResult.cType!`
	`194`	`+ let returnValue = swiftCallbackResult.dangle().cType!`
`195`	`195`
`196`	`196`	`return returnValue`
`197`	`197`	`}`