Draft: Support building with mtl-2.3.* (GHC 9.6)

TODO RGS: Fill me in
GaloisInc · Jul 28, 2023 · 07abcdc · 07abcdc
1 parent 64a4406
commit 07abcdc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/deps/elf-edit b/deps/elf-edit
diff --git a/src/Flexdis86/OpTable.hs b/src/Flexdis86/OpTable.hs
@@ -48,7 +48,8 @@ module Flexdis86.OpTable
 import qualified Control.DeepSeq as DS
 import qualified Control.Monad.Fail as MF
 import           Control.Lens
-import           Control.Monad.State
+import           Control.Monad (forM_, unless, when)
+import           Control.Monad.State (MonadState(..), execStateT, gets)
 import           Data.Bits ((.&.), (.|.), shiftR, shiftL)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as BSC

diff --git a/utils/DumpInstr.hs b/utils/DumpInstr.hs
@@ -3,9 +3,10 @@
 
 module Main where
 
-import           Control.Monad.Except
+import           Control.Monad (when)
+import           Control.Monad.Except (MonadError(..), ExceptT, runExceptT)
 import qualified Control.Monad.Fail as Fail
-import           Control.Monad.State
+import           Control.Monad.State (MonadState(..), State, evalState)
 import qualified Data.ByteString as BS
 import           Numeric (readHex)
 import           System.Environment (getArgs)