From 71955f257d10ab6af98dc0ab9c92f9546fa92e77 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 26 Mar 2023 13:03:22 -0500
Subject: [PATCH] =?UTF-8?q?Rename=20proc=20facet(=E2=80=A6)=20to=20proc=20?=
 =?UTF-8?q?inFacet(=E2=80=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/syndicate.nim        | 3 +--
 src/syndicate/actors.nim | 4 +++-
 src/syndicate/peers.nim  | 4 ++--
 src/syndicate/relays.nim | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/syndicate.nim b/src/syndicate.nim
index d40453b..56237d4 100644
--- a/src/syndicate.nim
+++ b/src/syndicate.nim
@@ -38,7 +38,7 @@ export SturdyRef
 
 export Actor, Assertion, Facet, Handle, Ref, Symbol, Turn, TurnAction,
     `$`, `?`, addCallback, analyse, asyncCheck, bootDataspace,
-        drop, facet, future, grab, message, newDataspace, publish,
+        drop, facet, future, grab, grabType, inFacet, message, newDataspace, publish,
         retract, replace, run, stop, unembed
 
 type
@@ -185,7 +185,6 @@ proc wrapDuringHandler(entryBody, exitBody: NimNode): NimNode =
     turnSym = ident"turn"
     bindingsSym = ident"bindings"
     handleSym = ident"duringHandle"
-    entrySym = genSym(nskProc, "during")
     duringSym = genSym(nskProc, "during")
   if exitBody.isNil:
     quote do:
diff --git a/src/syndicate/actors.nim b/src/syndicate/actors.nim
index d205bda..28a3119 100644
--- a/src/syndicate/actors.nim
+++ b/src/syndicate/actors.nim
@@ -367,10 +367,12 @@ proc stopIfInertAfter(action: TurnAction): TurnAction =
         stop(turn)
   wrapper
 
-proc facet*(turn: var Turn; bootProc: TurnAction): Facet =
+proc inFacet*(turn: var Turn; bootProc: TurnAction): Facet =
   result = newFacet(turn.facet.actor, some turn.facet)
   inFacet(turn, result, stopIfInertAfter(bootProc))
 
+proc facet*(turn: var Turn; bootProc: TurnAction): Facet {.deprecated.} = inFacet(turn, bootProc)
+
 proc newActor(name: string; bootProc: TurnAction; initialAssertions: OutboundTable): Actor =
   let
     now = getTime()
diff --git a/src/syndicate/peers.nim b/src/syndicate/peers.nim
index 3440340..b0fc80f 100644
--- a/src/syndicate/peers.nim
+++ b/src/syndicate/peers.nim
@@ -3,7 +3,7 @@
 
 ## Module for peering with remote dataspaces over network.
 
-import std/[asyncdispatch, net, options, streams, tables]
+import std/[asyncdispatch, net, options, tables]
 import preserves
 import ./actors, ./durings, ./relays, ./protocols/protocol
 
@@ -71,7 +71,7 @@ proc connectNet*(turn: var Turn; remote: RemoteSpecifier; cap: SturdyRef; bootPr
           reenable()
           discard publish(turn, shutdownRef, true)
           proc duringCallback(turn: var Turn; a: Assertion; h: Handle): TurnAction =
-            let facet = facet(turn) do (turn: var Turn):
+            let facet = inFacet(turn) do (turn: var Turn):
               bootProc(turn, unembed a)
             proc action(turn: var Turn) =
               stop(turn, facet)
diff --git a/src/syndicate/relays.nim b/src/syndicate/relays.nim
index f474371..b4ec3b1 100644
--- a/src/syndicate/relays.nim
+++ b/src/syndicate/relays.nim
@@ -340,7 +340,7 @@ when defined(posix):
             reenable()
             discard publish(turn, shutdownRef, true)
             proc duringCallback(turn: var Turn; a: Assertion; h: Handle): TurnAction =
-              let facet = facet(turn) do (turn: var Turn):
+              let facet = inFacet(turn) do (turn: var Turn):
                 bootProc(turn, unembed a)
               proc action(turn: var Turn) =
                 stop(turn, facet)