From 00269c04b1432662ceb84b665baf453f2878889e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 21 Dec 2022 23:01:06 -0600 Subject: [PATCH] Use "do ():" for compatibility with Nim 2.0.0 --- src/syndicate/actors.nim | 10 +++++----- src/syndicate/peers.nim | 4 ++-- src/syndicate/relays.nim | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/syndicate/actors.nim b/src/syndicate/actors.nim index f0cd8d3..d205bda 100644 --- a/src/syndicate/actors.nim +++ b/src/syndicate/actors.nim @@ -393,7 +393,7 @@ proc spawn*(name: string; turn: var Turn; bootProc: TurnAction; initialAssertion var newOutBound: Table[Handle, OutboundAssertion] for key in initialAssertions: discard turn.facet.outbound.pop(key, newOutbound[key]) - callSoon: + callSoon do (): discard newActor(name, bootProc, newOutBound) proc newInertRef*(): Ref = @@ -413,7 +413,7 @@ proc terminate(actor; turn; reason: ref Exception) = actor.future.complete() else: actor.future.fail reason - callSoon: + callSoon do (): run(actor.root, finish, true) proc terminate*(facet; e: ref Exception) = @@ -423,7 +423,7 @@ proc terminate*(facet; e: ref Exception) = proc asyncCheck*(turn; fut: FutureBase) = ## Sets a callback on `fut` which propagates exceptions to the facet of `turn`. let facet = turn.facet - fut.addCallback do: + fut.addCallback do (): if fut.failed: terminate(facet, fut.error) template tryFacet(facet; body: untyped) = @@ -433,7 +433,7 @@ template tryFacet(facet; body: untyped) = #except: terminate(facet, getCurrentException()) proc run(queues: Queues) = - callSoon: + callSoon do (): for facet, queue in queues: for action in queue: run(facet, action) @@ -459,7 +459,7 @@ proc addCallback*(fut: FutureBase; turn: var Turn; act: TurnAction) = if fut.finished: enqueue(turn, facet, act) else: - fut.addCallback do: + fut.addCallback do (): run(facet, act) proc addCallback*[T](fut: Future[T]; turn: var Turn; cb: proc (t: var Turn; f: Future[T]) {.closure, gcsafe.}) = diff --git a/src/syndicate/peers.nim b/src/syndicate/peers.nim index 459e71e..3440340 100644 --- a/src/syndicate/peers.nim +++ b/src/syndicate/peers.nim @@ -31,7 +31,7 @@ proc connectNet*(turn: var Turn; remote: RemoteSpecifier; cap: SturdyRef; bootPr reenable = facet.preventInertCheck() connectionClosedRef = newRef(turn, ShutdownEntity()) conn = connectTcp(remote) - conn.onReady do: + conn.onReady do (): discard bootActor("net") do (turn: var Turn): var shutdownRef: Ref proc tapsWriter(pkt: sink Packet): Future[void] = @@ -53,7 +53,7 @@ proc connectNet*(turn: var Turn; remote: RemoteSpecifier; cap: SturdyRef; bootPr terminate(facet, reason) conn.onReceiveError do (ctx: MessageContext; reason: ref Exception): terminate(facet, reason) - conn.onClosed do: + conn.onClosed do (): run(facet) do (turn: var Turn): stopActor(turn) var wireBuf = newBufferedDecoder() diff --git a/src/syndicate/relays.nim b/src/syndicate/relays.nim index 6be59b9..f474371 100644 --- a/src/syndicate/relays.nim +++ b/src/syndicate/relays.nim @@ -112,7 +112,7 @@ proc send(r: Relay; pkt: sink Packet): Future[void] = proc send(r: Relay; rOid: protocol.Oid; m: Event) = if r.pendingTurn.len == 0: - callSoon: + callSoon do (): r.facet.run do (turn: var Turn): var pkt = Packet( orKind: PacketKind.Turn,