Skip to content

Commit

Permalink
Support building with mtl-2.3.* (GHC 9.6)
Browse files Browse the repository at this point in the history
`mtl-2.3.*` no longer re-exports `Control.Monad` from its various modules,
which breaks some code in `flexdis86`. This is easily fixed by tightening up
the imports a bit.

I also bumped the `elf-edit` submodule to bring in the GHC 9.6–related changes
from GaloisInc/elf-edit#38.
  • Loading branch information
RyanGlScott committed Aug 4, 2023
1 parent 64a4406 commit 0b8ff86
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/Flexdis86/OpTable.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions utils/DumpInstr.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0b8ff86

Please sign in to comment.