diff --git a/src/Cryptol/ModuleSystem/Base.hs b/src/Cryptol/ModuleSystem/Base.hs index e89939158..922b985bb 100644 --- a/src/Cryptol/ModuleSystem/Base.hs +++ b/src/Cryptol/ModuleSystem/Base.hs @@ -28,7 +28,6 @@ import qualified Data.List.NonEmpty as NE import Data.List.NonEmpty (NonEmpty(..)) import Data.Function(on) import Data.Monoid ((<>),Endo(..), Any(..)) -import qualified Data.Text as T import Data.Text.Encoding (decodeUtf8') import System.Directory (doesFileExist, canonicalizePath) import System.FilePath ( addExtension @@ -134,7 +133,7 @@ renameImpNameInCurrentEnv (P.ImpNested pname) = fail ("Undefined submodule name: " ++ show (pp pname)) _:_:_ -> do fail ("Ambiguous submodule name: " ++ show (pp pname)) - [name] -> pure (P.ImpNested name) + [n] -> pure (P.ImpNested n) -- NoPat ----------------------------------------------------------------------- diff --git a/src/Cryptol/REPL/Command.hs b/src/Cryptol/REPL/Command.hs index ab79307ba..2f4e3cec4 100644 --- a/src/Cryptol/REPL/Command.hs +++ b/src/Cryptol/REPL/Command.hs @@ -2259,7 +2259,8 @@ loadProjectREPL cfg = M.InFile path -> case v of Proj.Invalid e -> - do rPrint ("Failed to process module: " <> text path <> ":" $$ ppInvalidStatus e) + do rPrint ("Failed to process module:" <+> (text path <> ":") $$ + indent 2 (ppInvalidStatus e)) pure (fpAcc, False) -- report failure Proj.Scanned Proj.Unchanged _ ((m,_):_) -> do let name = P.thing (P.mName m)