Fix up Runtime imports for unison bump

Author: ChrisPenner

src/Share/BackgroundJobs/Diffs/CausalDiffs.hs

@@ -25,8 +25,6 @@ import Share.Web.Authorization qualified as AuthZ
 import Share.Web.Errors (EntityMissing (..))
 import Share.Web.Share.Diffs.Impl qualified as Diffs
 import System.Clock qualified as Clock
-import Unison.Codebase.Runtime (Runtime)
-import Unison.Symbol (Symbol)
 
 -- | Check every 10 minutes if we haven't heard on the notifications channel.
 -- Just in case we missed a notification.
@@ -44,14 +42,14 @@ worker scope = do
 -- Process diffs until we run out of them. We claim a diff in a transaction and compute the diff in the same
 -- transaction, with a row lock on the contribution id (which is skipped by other workers). There's therefore no chance
 -- that we claim a diff but fail to write the result of computing that diff back to the database.
-processDiffs :: AuthZ.AuthZReceipt -> Runtime Symbol -> Background ()
+processDiffs :: AuthZ.AuthZReceipt -> CR.UnisonRuntime -> Background ()
 processDiffs authZReceipt unisonRuntime = do
   processDiff authZReceipt unisonRuntime >>= \case
     True -> processDiffs authZReceipt unisonRuntime
     False -> pure ()
 
 -- | Process a diff, then return whether or not we did any work.
-processDiff :: AuthZ.AuthZReceipt -> Runtime Symbol -> Background Bool
+processDiff :: AuthZ.AuthZReceipt -> CR.UnisonRuntime -> Background Bool
 processDiff authZReceipt unisonRuntime = do
   result <- Trace.withSpan "background:causal-diffs:process-diff" mempty $
     PG.runTransactionMode PG.RepeatableRead PG.ReadWrite do
@@ -90,7 +88,7 @@ processDiff authZReceipt unisonRuntime = do
 -- Returns whether or not we did any work.
 maybeComputeAndStoreCausalDiff ::
   AuthZ.AuthZReceipt ->
-  Runtime Symbol ->
+  CR.UnisonRuntime ->
   CausalDiffInfo ->
   PG.Transaction EntityMissing Bool
 maybeComputeAndStoreCausalDiff authZReceipt unisonRuntime (CausalDiffInfo {fromCausalId, toCausalId, fromCodebaseOwner, toCodebaseOwner}) = PG.transactionSpan "maybeComputeAndStoreCausalDiff" mempty $ do

src/Share/Codebase/CodebaseRuntime.hs

@@ -1,5 +1,6 @@
 module Share.Codebase.CodebaseRuntime
   ( withCodebaseRuntime,
+    UnisonRuntime,
   )
 where
 
@@ -8,11 +9,13 @@ import Share.Codebase.CodeCache qualified as CC
 import Share.Codebase.Types
 import Share.Postgres qualified as PG
 import Share.Prelude
-import Unison.Codebase.Runtime (Runtime)
+import Unison.Runtime (Runtime)
 import Unison.Symbol (Symbol)
 import Unison.Term qualified as Term
 import UnliftIO qualified
 
+type UnisonRuntime = Runtime Symbol
+
 -- | Construct a Runtime linked to a specific codebase and transaction.
 -- Don't use the runtime for one codebase with another codebase.
 -- Don't use this runtime in any transaction other than the one where it's created.

src/Share/Codebase/Types.hs

@@ -18,6 +18,7 @@ import Share.IDs
 import Unison.Codebase.CodeLookup qualified as CL
 import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.Runtime qualified as Rt
+import Unison.Runtime (Runtime)
 import Unison.DataDeclaration qualified as V1
 import Unison.NameSegment.Internal (NameSegment (..))
 import Unison.Parser.Ann (Ann)
@@ -57,7 +58,7 @@ data CodebaseRuntime scope m = CodebaseRuntime
     codeCache :: CodeCache scope,
     -- Function to look up cached evaluation results for the runtime.
     cachedEvalResult :: Reference.Id -> m (Maybe (Rt.Term Symbol)),
-    unisonRuntime :: Rt.Runtime Symbol
+    unisonRuntime :: Runtime Symbol
   }
 
 hoistCodebaseRuntime :: (Monad m) => (forall x. m x -> n x) -> CodebaseRuntime s m -> CodebaseRuntime s n

src/Share/Env.hs

@@ -18,7 +18,7 @@ import Share.Utils.Servant.Cookies qualified as Cookies
 import Share.Utils.Tags (HasTags (..))
 import System.Log.FastLogger (FormattedTime, LogStr)
 import System.Log.Raven.Types (SentryService)
-import Unison.Codebase.Runtime (Runtime)
+import Unison.Runtime (Runtime)
 import Unison.Symbol (Symbol)
 import Vault qualified