Make it build with mtl 2.3 (#131)

`mtl` no longer re-exports some common monad functions so import them from their place
plow-technologies · Jul 25, 2024 · 2cb89d0 · 2cb89d0
1 parent 3c376b2
commit 2cb89d0
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 18 deletions.
diff --git a/inferno-core/CHANGELOG.md b/inferno-core/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Revision History for inferno-core
 *Note*: we use https://pvp.haskell.org/ (MAJOR.MAJOR.MINOR.PATCH)
 
+## 0.11.6.0 -- 2024-07-25
+* mtl 2.3 compatibility
+
 ## 0.11.5.1 -- 2024-04-26
 * Fix pretty print of Some/None pattern in error messages
 

diff --git a/inferno-core/inferno-core.cabal b/inferno-core/inferno-core.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                inferno-core
-version:             0.11.5.1
+version:             0.11.6.0
 synopsis:            A statically-typed functional scripting language
 description:         Parser, type inference, and interpreter for a statically-typed functional scripting language
 category:            DSL,Scripting
@@ -63,7 +63,7 @@ library
     , inferno-types             >= 0.4.0 && < 0.5
     , megaparsec                >= 9.2.1 && < 9.3
     , memory                    >= 0.18.0 && < 0.19
-    , mtl                       >= 2.2.2 && < 2.3
+    , mtl                       >= 2.2.2 && < 2.4
     , parser-combinators        >= 1.3.0 && < 1.4
     , picosat                   >= 0.1.6 && < 0.2
     , prettyprinter             >= 1.7.1 && < 1.8

diff --git a/inferno-core/src/Inferno/Core.hs b/inferno-core/src/Inferno/Core.hs
@@ -6,7 +6,7 @@ module Inferno.Core where
 
 import Control.Monad (foldM)
 import Control.Monad.Catch (MonadCatch, MonadThrow)
-import Control.Monad.Except (MonadFix)
+import Control.Monad.Fix (MonadFix)
 import Data.Bifunctor (bimap, first)
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.Map as Map

diff --git a/inferno-core/src/Inferno/Eval.hs b/inferno-core/src/Inferno/Eval.hs
@@ -3,8 +3,8 @@
 
 module Inferno.Eval where
 
+import Control.Monad (forM)
 import Control.Monad.Catch (MonadCatch, MonadThrow (throwM), try)
-import Control.Monad.Except (forM)
 import Control.Monad.Reader (ask, local)
 import Data.Foldable (foldrM)
 import Data.Functor ((<&>))

diff --git a/inferno-core/src/Inferno/Infer.hs b/inferno-core/src/Inferno/Infer.hs
@@ -16,14 +16,16 @@ module Inferno.Infer
   )
 where
 
-import Control.Monad (when)
+import Control.Monad
+  ( foldM,
+    forM,
+    forM_,
+    when,
+  )
 import Control.Monad.Except
   ( Except,
     ExceptT,
     MonadError (catchError, throwError),
-    foldM,
-    forM,
-    forM_,
     runExcept,
     runExceptT,
   )

diff --git a/inferno-core/src/Inferno/Instances/Arbitrary.hs b/inferno-core/src/Inferno/Instances/Arbitrary.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 

diff --git a/inferno-core/src/Inferno/Utils/QQ/Script.hs b/inferno-core/src/Inferno/Utils/QQ/Script.hs
@@ -8,7 +8,7 @@ module Inferno.Utils.QQ.Script where
 import Control.Monad.Catch (MonadCatch (..), MonadThrow (..))
 import Control.Monad.IO.Class (MonadIO)
 import Control.Monad.Reader (ReaderT (..))
-import Control.Monad.Writer (WriterT (..), appEndo)
+import Control.Monad.Writer (WriterT (..))
 import qualified Crypto.Hash as Crypto
 import Data.ByteArray (convert)
 import Data.ByteString (ByteString, unpack)
@@ -17,6 +17,7 @@ import Data.Generics.Aliases (extQ)
 import Data.List (intercalate)
 import qualified Data.List.NonEmpty as NEList
 import qualified Data.Maybe as Maybe
+import Data.Monoid (appEndo)
 import Data.Text (pack)
 import Inferno.Infer (inferExpr)
 import Inferno.Infer.Pinned (pinExpr)

diff --git a/inferno-types/CHANGELOG.md b/inferno-types/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Revision History for inferno-types
 *Note*: we use https://pvp.haskell.org/ (MAJOR.MAJOR.MINOR.PATCH)
 
+## 0.4.6.0 -- 2024-07-25
+* mtl 2.3 compatibility
+
 ## 0.4.5.0 -- 2024-04-26
 * Add `unusedVars` method for `Expr`s and tests for it
 

diff --git a/inferno-types/inferno-types.cabal b/inferno-types/inferno-types.cabal
@@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                inferno-types
-version:             0.4.5.0
+version:             0.4.6.0
 synopsis:            Core types for Inferno
 description:         Core types for the Inferno language
 category:            DSL,Scripting
@@ -43,7 +43,7 @@ library
     , hashable                           >= 1.4.1 && < 1.5
     , megaparsec                         >= 9.2.1 && < 9.3
     , memory                             >= 0.18.0 && < 0.19
-    , mtl                                >= 2.2.2 && < 2.3
+    , mtl                                >= 2.2.2 && < 2.4
     , prettyprinter                      >= 1.7.1 && < 1.8
     , recursion-schemes                  >= 5.2.2.3 && < 5.3
     , servant                            >= 0.19 && < 0.20

diff --git a/inferno-types/src/Inferno/Types/Value.hs b/inferno-types/src/Inferno/Types/Value.hs
@@ -6,10 +6,11 @@ module Inferno.Types.Value where
 
 import Control.DeepSeq (NFData, rnf)
 import Control.Monad.Catch (MonadCatch (..), MonadThrow (..))
-import Control.Monad.Except (MonadError, lift)
+import Control.Monad.Except (MonadError)
 import Control.Monad.Fix (MonadFix)
 import Control.Monad.IO.Class (MonadIO)
 import Control.Monad.Reader (MonadReader, ReaderT (..))
+import Control.Monad.Trans (lift)
 import Data.Int (Int64)
 import qualified Data.Map as Map
 import Data.Text (Text)
@@ -51,7 +52,7 @@ data Value custom m
   | VTypeRep InfernoType
   | VCustom custom
 
-instance NFData custom => NFData (Value custom m) where
+instance (NFData custom) => NFData (Value custom m) where
   rnf (VInt x) = x `seq` ()
   rnf (VDouble x) = x `seq` ()
   rnf (VWord16 x) = x `seq` ()
@@ -69,7 +70,7 @@ instance NFData custom => NFData (Value custom m) where
   rnf (VTypeRep x) = rnf x
   rnf (VCustom x) = rnf x
 
-instance Eq c => Eq (Value c m) where
+instance (Eq c) => Eq (Value c m) where
   (VInt i1) == (VInt i2) = i1 == i2
   (VDouble v1) == (VDouble v2) = v1 == v2
   (VWord16 w1) == (VWord16 w2) = w1 == w2
@@ -88,7 +89,7 @@ instance Eq c => Eq (Value c m) where
   (VCustom c1) == (VCustom c2) = c1 == c2
   _ == _ = False
 
-instance Pretty c => Pretty (Value c m) where
+instance (Pretty c) => Pretty (Value c m) where
   pretty = \case
     VInt n -> pretty n
     VDouble n -> pretty n
@@ -113,14 +114,14 @@ instance Pretty c => Pretty (Value c m) where
 newtype ImplEnvM m c a = ImplEnvM {unImplEnvM :: ReaderT (Map.Map ExtIdent (Value c (ImplEnvM m c))) m a}
   deriving (Applicative, Functor, Monad, MonadReader (Map.Map ExtIdent (Value c (ImplEnvM m c))), MonadError e, MonadFix, MonadIO)
 
-instance MonadThrow m => MonadThrow (ImplEnvM m c) where
+instance (MonadThrow m) => MonadThrow (ImplEnvM m c) where
   throwM = ImplEnvM . lift . throwM
 
-instance MonadCatch m => MonadCatch (ImplEnvM m c) where
+instance (MonadCatch m) => MonadCatch (ImplEnvM m c) where
   catch (ImplEnvM (ReaderT m)) c = ImplEnvM $ ReaderT $ \env ->
     m env `catch` \e -> runImplEnvM env (c e)
 
-liftImplEnvM :: Monad m => m a -> ImplEnvM m c a
+liftImplEnvM :: (Monad m) => m a -> ImplEnvM m c a
 liftImplEnvM = ImplEnvM . lift
 
 runImplEnvM :: Map.Map ExtIdent (Value c (ImplEnvM m c)) -> ImplEnvM m c a -> m a