Skip to content

Commit ec2a974

Browse files
committed
Use empty tuple for early Void return statements.
1 parent e887452 commit ec2a974

36 files changed

+58
-58
lines changed

out/traits/BindingsType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ extension Bindings {
200200
internal func free() {
201201

202202
// TODO: figure out something smarter
203-
return // the semicolon is necessary because Swift is whitespace-agnostic
203+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
204204

205205
Bindings.print(
206206
"Error: BindingsType::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/BroadcasterInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ extension Bindings {
137137
internal func free() {
138138

139139
// TODO: figure out something smarter
140-
return // the semicolon is necessary because Swift is whitespace-agnostic
140+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
141141

142142
Bindings.print(
143143
"Error: BroadcasterInterface::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/ChannelMessageHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ extension Bindings {
998998
internal func free() {
999999

10001000
// TODO: figure out something smarter
1001-
return // the semicolon is necessary because Swift is whitespace-agnostic
1001+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
10021002

10031003
Bindings.print(
10041004
"Error: ChannelMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/ChannelSigner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ extension Bindings {
315315
internal func free() {
316316

317317
// TODO: figure out something smarter
318-
return // the semicolon is necessary because Swift is whitespace-agnostic
318+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
319319

320320
Bindings.print(
321321
"Error: ChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Confirm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ extension Bindings {
356356
internal func free() {
357357

358358
// TODO: figure out something smarter
359-
return // the semicolon is necessary because Swift is whitespace-agnostic
359+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
360360

361361
Bindings.print(
362362
"Error: Confirm::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/CustomMessageHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ extension Bindings {
194194
internal func free() {
195195

196196
// TODO: figure out something smarter
197-
return // the semicolon is necessary because Swift is whitespace-agnostic
197+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
198198

199199
Bindings.print(
200200
"Error: CustomMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/CustomMessageReader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ extension Bindings {
144144
internal func free() {
145145

146146
// TODO: figure out something smarter
147-
return // the semicolon is necessary because Swift is whitespace-agnostic
147+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
148148

149149
Bindings.print(
150150
"Error: CustomMessageReader::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/CustomOnionMessageContents.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ extension Bindings {
167167
internal func free() {
168168

169169
// TODO: figure out something smarter
170-
return // the semicolon is necessary because Swift is whitespace-agnostic
170+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
171171

172172
Bindings.print(
173173
"Error: CustomOnionMessageContents::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/CustomOnionMessageHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ extension Bindings {
194194
internal func free() {
195195

196196
// TODO: figure out something smarter
197-
return // the semicolon is necessary because Swift is whitespace-agnostic
197+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
198198

199199
Bindings.print(
200200
"Error: CustomOnionMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/EcdsaChannelSigner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ extension Bindings {
570570
internal func free() {
571571

572572
// TODO: figure out something smarter
573-
return // the semicolon is necessary because Swift is whitespace-agnostic
573+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
574574

575575
Bindings.print(
576576
"Error: EcdsaChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/EntropySource.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ extension Bindings {
136136
internal func free() {
137137

138138
// TODO: figure out something smarter
139-
return // the semicolon is necessary because Swift is whitespace-agnostic
139+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
140140

141141
Bindings.print(
142142
"Error: EntropySource::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/EventHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ extension Bindings {
143143
internal func free() {
144144

145145
// TODO: figure out something smarter
146-
return // the semicolon is necessary because Swift is whitespace-agnostic
146+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
147147

148148
Bindings.print(
149149
"Error: EventHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/EventsProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ extension Bindings {
206206
internal func free() {
207207

208208
// TODO: figure out something smarter
209-
return // the semicolon is necessary because Swift is whitespace-agnostic
209+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
210210

211211
Bindings.print(
212212
"Error: EventsProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/FeeEstimator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ extension Bindings {
149149
internal func free() {
150150

151151
// TODO: figure out something smarter
152-
return // the semicolon is necessary because Swift is whitespace-agnostic
152+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
153153

154154
Bindings.print(
155155
"Error: FeeEstimator::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Filter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ extension Bindings {
214214
internal func free() {
215215

216216
// TODO: figure out something smarter
217-
return // the semicolon is necessary because Swift is whitespace-agnostic
217+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
218218

219219
Bindings.print(
220220
"Error: Filter::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/FutureCallback.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ extension Bindings {
146146
internal func free() {
147147

148148
// TODO: figure out something smarter
149-
return // the semicolon is necessary because Swift is whitespace-agnostic
149+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
150150

151151
Bindings.print(
152152
"Error: FutureCallback::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Listen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ extension Bindings {
228228
internal func free() {
229229

230230
// TODO: figure out something smarter
231-
return // the semicolon is necessary because Swift is whitespace-agnostic
231+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
232232

233233
Bindings.print(
234234
"Error: Listen::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/LockableScore.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ extension Bindings {
145145
internal func free() {
146146

147147
// TODO: figure out something smarter
148-
return // the semicolon is necessary because Swift is whitespace-agnostic
148+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
149149

150150
Bindings.print(
151151
"Error: LockableScore::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Logger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ extension Bindings {
130130
internal func free() {
131131

132132
// TODO: figure out something smarter
133-
return // the semicolon is necessary because Swift is whitespace-agnostic
133+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
134134

135135
Bindings.print(
136136
"Error: Logger::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/MessageSendEventsProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ extension Bindings {
138138
internal func free() {
139139

140140
// TODO: figure out something smarter
141-
return // the semicolon is necessary because Swift is whitespace-agnostic
141+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
142142

143143
Bindings.print(
144144
"Error: MessageSendEventsProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/NodeSigner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ extension Bindings {
310310
internal func free() {
311311

312312
// TODO: figure out something smarter
313-
return // the semicolon is necessary because Swift is whitespace-agnostic
313+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
314314

315315
Bindings.print(
316316
"Error: NodeSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/OnionMessageHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ extension Bindings {
297297
internal func free() {
298298

299299
// TODO: figure out something smarter
300-
return // the semicolon is necessary because Swift is whitespace-agnostic
300+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
301301

302302
Bindings.print(
303303
"Error: OnionMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/OnionMessageProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ extension Bindings {
142142
internal func free() {
143143

144144
// TODO: figure out something smarter
145-
return // the semicolon is necessary because Swift is whitespace-agnostic
145+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
146146

147147
Bindings.print(
148148
"Error: OnionMessageProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Persist.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ extension Bindings {
271271
internal func free() {
272272

273273
// TODO: figure out something smarter
274-
return // the semicolon is necessary because Swift is whitespace-agnostic
274+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
275275

276276
Bindings.print(
277277
"Error: Persist::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Persister.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ extension Bindings {
205205
internal func free() {
206206

207207
// TODO: figure out something smarter
208-
return // the semicolon is necessary because Swift is whitespace-agnostic
208+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
209209

210210
Bindings.print(
211211
"Error: Persister::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Router.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ extension Bindings {
223223
internal func free() {
224224

225225
// TODO: figure out something smarter
226-
return // the semicolon is necessary because Swift is whitespace-agnostic
226+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
227227

228228
Bindings.print(
229229
"Error: Router::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/RoutingMessageHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ extension Bindings {
620620
internal func free() {
621621

622622
// TODO: figure out something smarter
623-
return // the semicolon is necessary because Swift is whitespace-agnostic
623+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
624624

625625
Bindings.print(
626626
"Error: RoutingMessageHandler::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Score.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extension Bindings {
312312
internal func free() {
313313

314314
// TODO: figure out something smarter
315-
return // the semicolon is necessary because Swift is whitespace-agnostic
315+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
316316

317317
Bindings.print(
318318
"Error: Score::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/SignerProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ extension Bindings {
309309
internal func free() {
310310

311311
// TODO: figure out something smarter
312-
return // the semicolon is necessary because Swift is whitespace-agnostic
312+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
313313

314314
Bindings.print(
315315
"Error: SignerProvider::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/SocketDescriptor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ extension Bindings {
269269
internal func free() {
270270

271271
// TODO: figure out something smarter
272-
return // the semicolon is necessary because Swift is whitespace-agnostic
272+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
273273

274274
Bindings.print(
275275
"Error: SocketDescriptor::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/UtxoLookup.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extension Bindings {
141141
internal func free() {
142142

143143
// TODO: figure out something smarter
144-
return // the semicolon is necessary because Swift is whitespace-agnostic
144+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
145145

146146
Bindings.print(
147147
"Error: UtxoLookup::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/Watch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ extension Bindings {
263263
internal func free() {
264264

265265
// TODO: figure out something smarter
266-
return // the semicolon is necessary because Swift is whitespace-agnostic
266+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
267267

268268
Bindings.print(
269269
"Error: Watch::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/WriteableEcdsaChannelSigner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ extension Bindings {
151151
internal func free() {
152152

153153
// TODO: figure out something smarter
154-
return // the semicolon is necessary because Swift is whitespace-agnostic
154+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
155155

156156
Bindings.print(
157157
"Error: WriteableEcdsaChannelSigner::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

out/traits/WriteableScore.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ extension Bindings {
143143
internal func free() {
144144

145145
// TODO: figure out something smarter
146-
return // the semicolon is necessary because Swift is whitespace-agnostic
146+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
147147

148148
Bindings.print(
149149
"Error: WriteableScore::free MUST be overridden! Offending class: \(String(describing: self)). Aborting.",

src/generation/primitive_enum_generator.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ export default class PrimitiveEnumGenerator extends BaseTypeGenerator<RustPrimit
4141
}
4242

4343
swiftValueInitializer += `
44-
default:
45-
Bindings.print("Error: Invalid value type for ${swiftTypeName}! Aborting.", severity: .ERROR)
46-
abort()
47-
`;
44+
default:
45+
Bindings.print("Error: Invalid value type for ${swiftTypeName}! Aborting.", severity: .ERROR)
46+
abort()
47+
`;
4848

4949
return `
5050
#if SWIFT_PACKAGE

src/generation/trait_generator.mts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,17 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
228228
if (isFreeCallback) {
229229
isFreeBody = `
230230
// TODO: figure out something smarter
231-
return; // the semicolon is necessary because Swift is whitespace-agnostic
231+
return () // the empty tuple (aka Void) is necessary because Swift is whitespace-agnostic
232232
`;
233233
}
234234

235235
return `
236-
${this.renderDocComment(lambda.documentation, 5)}
237-
${visibility} func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) -> ${swiftReturnType} {
238-
${isFreeBody}
239-
Bindings.print("Error: ${swiftTypeName}::${swiftMethodName} MUST be overridden! Offending class: \\(String(describing: self)). Aborting.", severity: .ERROR)
240-
abort()
241-
}
236+
${this.renderDocComment(lambda.documentation, 5)}
237+
${visibility} func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) -> ${swiftReturnType} {
238+
${isFreeBody}
239+
Bindings.print("Error: ${swiftTypeName}::${swiftMethodName} MUST be overridden! Offending class: \\(String(describing: self)). Aborting.", severity: .ERROR)
240+
abort()
241+
}
242242
`;
243243
}
244244

@@ -296,24 +296,24 @@ export default class TraitGenerator extends BaseTypeGenerator<RustTrait> {
296296
}
297297

298298
return `
299-
${this.renderDocComment(lambda.documentation, 5)}
300-
public override func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) ${returnTypeInfix}{
301-
// native call variable prep
302-
${nativeCallPrefix}
299+
${this.renderDocComment(lambda.documentation, 5)}
300+
public override func ${swiftMethodName}(${swiftMethodArguments.join(', ')}) ${returnTypeInfix}{
301+
// native call variable prep
302+
${nativeCallPrefix}
303303
304-
${freeBody}
304+
${freeBody}
305305
306-
// native method call
307-
let nativeCallResult = ${nativeCallWrapperPrefix}self.cType!.${lambda.name}(${nativeCallValueAccessors.join(', ')})${nativeCallWrapperSuffix}
306+
// native method call
307+
let nativeCallResult = ${nativeCallWrapperPrefix}self.cType!.${lambda.name}(${nativeCallValueAccessors.join(', ')})${nativeCallWrapperSuffix}
308308
309-
// cleanup
310-
${nativeCallSuffix}
309+
// cleanup
310+
${nativeCallSuffix}
311311
312-
// return value (do some wrapping)
313-
let returnValue = ${preparedReturnValue.wrapperPrefix}nativeCallResult${preparedReturnValue.wrapperSuffix}
312+
// return value (do some wrapping)
313+
let returnValue = ${preparedReturnValue.wrapperPrefix}nativeCallResult${preparedReturnValue.wrapperSuffix}
314314
315-
return returnValue
316-
}
315+
return returnValue
316+
}
317317
`;
318318
}
319319

0 commit comments

Comments
 (0)