From ab9010f7d730202db72195265286d5bb9a4b64bf Mon Sep 17 00:00:00 2001 From: Rob Dockins Date: Wed, 9 Dec 2020 15:23:13 -0800 Subject: [PATCH] Update imports in cryptol-remote-api --- cryptol-remote-api/src/CryptolServer.hs | 2 +- cryptol-remote-api/src/CryptolServer/EvalExpr.hs | 2 +- cryptol-remote-api/src/CryptolServer/Options.hs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cryptol-remote-api/src/CryptolServer.hs b/cryptol-remote-api/src/CryptolServer.hs index 0a31885d6..bd55237d5 100644 --- a/cryptol-remote-api/src/CryptolServer.hs +++ b/cryptol-remote-api/src/CryptolServer.hs @@ -10,7 +10,7 @@ import Control.Monad.IO.Class import Control.Monad.Reader (ReaderT(ReaderT)) import qualified Data.Aeson as JSON -import Cryptol.Eval (EvalOpts) +import Cryptol.Eval (EvalOpts(..)) import Cryptol.ModuleSystem (ModuleCmd, ModuleEnv, ModuleInput(..)) import Cryptol.ModuleSystem.Env (getLoadedModules, lmFilePath, lmFingerprint, meLoadedModules, diff --git a/cryptol-remote-api/src/CryptolServer/EvalExpr.hs b/cryptol-remote-api/src/CryptolServer/EvalExpr.hs index 6fe211f1c..78ceb994e 100644 --- a/cryptol-remote-api/src/CryptolServer/EvalExpr.hs +++ b/cryptol-remote-api/src/CryptolServer/EvalExpr.hs @@ -5,7 +5,7 @@ import Control.Monad.IO.Class import Data.Aeson as JSON -import Cryptol.ModuleSystem (checkExpr, evalExpr, getPrimMap) +import Cryptol.ModuleSystem (checkExpr, evalExpr) import Cryptol.ModuleSystem.Env (meSolverConfig) import Cryptol.TypeCheck.Solve (defaultReplExpr) import Cryptol.TypeCheck.Subst (apSubst, listParamSubst) diff --git a/cryptol-remote-api/src/CryptolServer/Options.hs b/cryptol-remote-api/src/CryptolServer/Options.hs index 5bd0a177b..c4dd7fe46 100644 --- a/cryptol-remote-api/src/CryptolServer/Options.hs +++ b/cryptol-remote-api/src/CryptolServer/Options.hs @@ -6,9 +6,10 @@ module CryptolServer.Options (Options(..), WithOptions(..)) where import Data.Aeson hiding (Options) import qualified Data.HashMap.Strict as HM -import Cryptol.Backend.Monad (EvalOpts(..), PPOpts(..), PPFloatFormat(..), PPFloatExp(..)) +import Cryptol.Eval(EvalOpts(..)) import Cryptol.REPL.Monad (parsePPFloatFormat) import Cryptol.Utils.Logger (quietLogger) +import Cryptol.Utils.PP (PPOpts(..), PPFloatFormat(..), PPFloatExp(..)) data Options = Options { optCallStacks :: Bool, optEvalOpts :: EvalOpts }