Use empty tuple for early Void return statements.

arik-so · arik-so · commit ec2a974d3495 · 2023-07-30T12:19:11.000-07:00
diff --git a/out/traits/BindingsType.swift b/out/traits/BindingsType.swift
@@ -200,7 +200,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: BindingsType::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/BroadcasterInterface.swift b/out/traits/BroadcasterInterface.swift
@@ -137,7 +137,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: BroadcasterInterface::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/ChannelMessageHandler.swift b/out/traits/ChannelMessageHandler.swift
@@ -998,7 +998,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: ChannelMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/ChannelSigner.swift b/out/traits/ChannelSigner.swift
@@ -315,7 +315,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: ChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Confirm.swift b/out/traits/Confirm.swift
@@ -356,7 +356,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Confirm::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/CustomMessageHandler.swift b/out/traits/CustomMessageHandler.swift
@@ -194,7 +194,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: CustomMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/CustomMessageReader.swift b/out/traits/CustomMessageReader.swift
@@ -144,7 +144,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: CustomMessageReader::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/CustomOnionMessageContents.swift b/out/traits/CustomOnionMessageContents.swift
@@ -167,7 +167,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: CustomOnionMessageContents::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/CustomOnionMessageHandler.swift b/out/traits/CustomOnionMessageHandler.swift
@@ -194,7 +194,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: CustomOnionMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/EcdsaChannelSigner.swift b/out/traits/EcdsaChannelSigner.swift
@@ -570,7 +570,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: EcdsaChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/EntropySource.swift b/out/traits/EntropySource.swift
@@ -136,7 +136,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: EntropySource::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/EventHandler.swift b/out/traits/EventHandler.swift
@@ -143,7 +143,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: EventHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/EventsProvider.swift b/out/traits/EventsProvider.swift
@@ -206,7 +206,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: EventsProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/FeeEstimator.swift b/out/traits/FeeEstimator.swift
@@ -149,7 +149,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: FeeEstimator::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Filter.swift b/out/traits/Filter.swift
@@ -214,7 +214,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Filter::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/FutureCallback.swift b/out/traits/FutureCallback.swift
@@ -146,7 +146,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: FutureCallback::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Listen.swift b/out/traits/Listen.swift
@@ -228,7 +228,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Listen::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/LockableScore.swift b/out/traits/LockableScore.swift
@@ -145,7 +145,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: LockableScore::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Logger.swift b/out/traits/Logger.swift
@@ -130,7 +130,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Logger::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/MessageSendEventsProvider.swift b/out/traits/MessageSendEventsProvider.swift
@@ -138,7 +138,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: MessageSendEventsProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/NodeSigner.swift b/out/traits/NodeSigner.swift
@@ -310,7 +310,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: NodeSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/OnionMessageHandler.swift b/out/traits/OnionMessageHandler.swift
@@ -297,7 +297,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: OnionMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/OnionMessageProvider.swift b/out/traits/OnionMessageProvider.swift
@@ -142,7 +142,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: OnionMessageProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Persist.swift b/out/traits/Persist.swift
@@ -271,7 +271,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Persist::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Persister.swift b/out/traits/Persister.swift
@@ -205,7 +205,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Persister::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Router.swift b/out/traits/Router.swift
@@ -223,7 +223,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Router::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/RoutingMessageHandler.swift b/out/traits/RoutingMessageHandler.swift
@@ -620,7 +620,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: RoutingMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Score.swift b/out/traits/Score.swift
@@ -312,7 +312,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Score::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/SignerProvider.swift b/out/traits/SignerProvider.swift
@@ -309,7 +309,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: SignerProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/SocketDescriptor.swift b/out/traits/SocketDescriptor.swift
@@ -269,7 +269,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: SocketDescriptor::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/UtxoLookup.swift b/out/traits/UtxoLookup.swift
@@ -141,7 +141,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: UtxoLookup::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/Watch.swift b/out/traits/Watch.swift
@@ -263,7 +263,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: Watch::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/WriteableEcdsaChannelSigner.swift b/out/traits/WriteableEcdsaChannelSigner.swift
@@ -151,7 +151,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: WriteableEcdsaChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/out/traits/WriteableScore.swift b/out/traits/WriteableScore.swift
@@ -143,7 +143,7 @@ extension Bindings {
 		internal func free() {
 
 			// TODO: figure out something smarter
-			return  // the semicolon is necessary because Swift is whitespace-agnostic
+			return ()  // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 
 			Bindings.print(
 				"Error: WriteableScore::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",
diff --git a/src/generation/primitive_enum_generator.mts b/src/generation/primitive_enum_generator.mts
@@ -41,10 +41,10 @@ export default class PrimitiveEnumGenerator extends BaseTypeGenerator<RustPrimit
 		}
 
 		swiftValueInitializer += `
-							default:
-								Bindings.print("Error: Invalid value type for ${swiftTypeName}! Aborting.", severity: .ERROR)
-								abort()
-				`;
+			default:
+				Bindings.print("Error: Invalid value type for ${swiftTypeName}! Aborting.", severity: .ERROR)
+				abort()
+		`;
 
 		return `
 			#if SWIFT_PACKAGE
diff --git a/src/generation/trait_generator.mts b/src/generation/trait_generator.mts
@@ -228,17 +228,17 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
 		if (isFreeCallback) {
 			isFreeBody = `
 				// TODO: figure out something smarter
-				return; // the semicolon is necessary because Swift is whitespace-agnostic
+				return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
 			`;
 		}
 
 		return `
-					${this.renderDocComment(lambda.documentation, 5)}
-					${visibility} func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) -> ${swiftReturnType} {
-						${isFreeBody}
-						Bindings.print("Error: ${swiftTypeName}::${swiftMethodName} MUST be overridden! Offending class: \\(String(describing: self)). Aborting.", severity: .ERROR)
-						abort()
-					}
+			${this.renderDocComment(lambda.documentation, 5)}
+			${visibility} func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) -> ${swiftReturnType} {
+				${isFreeBody}
+				Bindings.print("Error: ${swiftTypeName}::${swiftMethodName} MUST be overridden! Offending class: \\(String(describing: self)). Aborting.", severity: .ERROR)
+				abort()
+			}
 		`;
 	}
 
@@ -296,24 +296,24 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
 		}
 
 		return `
-					${this.renderDocComment(lambda.documentation, 5)}
-					public override func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) ${returnTypeInfix}{
-						// native call variable prep
-						${nativeCallPrefix}
+			${this.renderDocComment(lambda.documentation, 5)}
+			public override func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) ${returnTypeInfix}{
+				// native call variable prep
+				${nativeCallPrefix}
 
-						${freeBody}
+				${freeBody}
 
-						// native method call
-						let nativeCallResult = ${nativeCallWrapperPrefix}self.cType!.${lambda.name}(${nativeCallValueAccessors.join(', ')})${nativeCallWrapperSuffix}
+				// native method call
+				let nativeCallResult = ${nativeCallWrapperPrefix}self.cType!.${lambda.name}(${nativeCallValueAccessors.join(', ')})${nativeCallWrapperSuffix}
 
-						// cleanup
-						${nativeCallSuffix}
+				// cleanup
+				${nativeCallSuffix}
 
-						// return value (do some wrapping)
-						let returnValue = ${preparedReturnValue.wrapperPrefix}nativeCallResult${preparedReturnValue.wrapperSuffix}
+				// return value (do some wrapping)
+				let returnValue = ${preparedReturnValue.wrapperPrefix}nativeCallResult${preparedReturnValue.wrapperSuffix}
 
-						return returnValue
-					}
+				return returnValue
+			}
 		`;
 	}
 
