backport tryError

GaloisInc · Dec 17, 2024 · 8a68c08 · 8a68c08
1 parent 1cd50c3
commit 8a68c08
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/cabal.GHC-9.4.8.config b/cabal.GHC-9.4.8.config
@@ -182,7 +182,7 @@ constraints: any.BoundedChan ==1.0.3.0,
              mod +semirings +vector,
              any.monad-control ==1.0.3.1,
              any.monadLib ==3.10.1,
-             any.mtl ==2.3.1,
+             any.mtl ==2.2.2,
              any.mwc-random ==0.15.0.2,
              any.network ==3.1.4.0,
              network -devel,

diff --git a/cabal.GHC-9.6.5.config b/cabal.GHC-9.6.5.config
@@ -180,7 +180,7 @@ constraints: any.BoundedChan ==1.0.3.0,
              mod +semirings +vector,
              any.monad-control ==1.0.3.1,
              any.monadLib ==3.10.1,
-             any.mtl ==2.3.1,
+             any.mtl ==2.2.1,
              any.mwc-random ==0.15.0.2,
              any.network ==3.1.4.0,
              network -devel,

diff --git a/cabal.GHC-9.8.2.config b/cabal.GHC-9.8.2.config
@@ -180,7 +180,7 @@ constraints: any.BoundedChan ==1.0.3.0,
              mod +semirings +vector,
              any.monad-control ==1.0.3.1,
              any.monadLib ==3.10.1,
-             any.mtl ==2.3.1,
+             any.mtl ==2.2.1,
              any.mwc-random ==0.15.0.2,
              any.network ==3.1.4.0,
              network -devel,

diff --git a/cryptol.cabal b/cryptol.cabal
@@ -84,7 +84,7 @@ library
                        toml-parser       >= 2.0 && <2.1,
                        transformers-base >= 0.4,
                        vector,
-                       mtl               >= 2.3.1,
+                       mtl               >= 2.2.1,
                        time              >= 1.6.0.1,
                        panic             >= 0.3,
                        what4             >= 1.4 && < 1.7

diff --git a/src/Cryptol/Project/Monad.hs b/src/Cryptol/Project/Monad.hs
@@ -26,7 +26,7 @@ import           Data.Map.Strict                  (Map)
 import qualified Data.Map.Strict                  as Map
 import           Control.Monad.Reader
 import           Control.Monad.State
-import           Control.Monad.Except
+import           Control.Monad.Except hiding (tryError)
 import           System.Directory
 import           System.FilePath                  (makeRelative)
 
@@ -112,6 +112,10 @@ doIO m = doModule (M.io m)
 tryLoadM :: LoadM Err a -> LoadM any (Either M.ModuleError a)
 tryLoadM (LoadM m) = LoadM (tryError m)
 
+-- Introduced in mtl-2.3.1 which we can't rely upon yet
+tryError :: MonadError e m => m a -> m (Either e a)
+tryError action = (Right <$> action) `catchError` (pure . Left)
+
 -- | Print a line
 lPutStrLn :: String -> LoadM any ()
 lPutStrLn msg = doModuleNonFail (withLogger logPutStrLn msg)