Malke sure we import the correct stuff from mtl

luc-tielen · May 5, 2024 · 96aed23 · 96aed23
1 parent 422895a
commit 96aed23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/Language/Souffle/Compiled.hs b/lib/Language/Souffle/Compiled.hs
@@ -31,7 +31,7 @@ module Language.Souffle.Compiled
   ) where
 
 import Prelude hiding ( init )
-import Control.Monad.State.Strict
+import Control.Monad.State.Strict (StateT, MonadState (..), evalStateT, modify, gets)
 import Data.Foldable ( traverse_ )
 import Data.Functor.Identity
 import Data.Proxy
@@ -60,7 +60,7 @@ import qualified Language.Souffle.Internal as Internal
 import Language.Souffle.Marshal
 import Control.Concurrent
 import Control.Monad (when)
-
+import Control.Monad.IO.Class (MonadIO (..))
 
 type ByteCount :: Type
 type ByteCount = Int

diff --git a/souffle-haskell.cabal b/souffle-haskell.cabal
@@ -105,9 +105,8 @@ library
     -Wno-missing-import-lists -Wno-type-defaults
     -Wno-missing-local-signatures -Wno-monomorphism-restriction
     -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode
-    -Wno-operator-whitespace
-    -fhide-source-paths -fno-show-valid-hole-fits
-    -fno-sort-valid-hole-fits
+    -Wno-operator-whitespace -fhide-source-paths
+    -fno-show-valid-hole-fits -fno-sort-valid-hole-fits
 
   cxx-options:        -std=c++17 -Wall
   include-dirs:       cbits cbits/souffle
@@ -205,10 +204,9 @@ test-suite souffle-haskell-test
     -Wno-missing-import-lists -Wno-type-defaults
     -Wno-missing-local-signatures -Wno-monomorphism-restriction
     -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode
-    -Wno-operator-whitespace
-    -fhide-source-paths -fno-show-valid-hole-fits
-    -fno-sort-valid-hole-fits -Wno-missing-kind-signatures
-    -Wno-operator-whitespace
+    -Wno-operator-whitespace -fhide-source-paths
+    -fno-show-valid-hole-fits -fno-sort-valid-hole-fits
+    -Wno-missing-kind-signatures -Wno-operator-whitespace
 
   cxx-options:        -std=c++17 -D__EMBEDDED_SOUFFLE__
   include-dirs:       cbits cbits/souffle
@@ -302,9 +300,8 @@ benchmark souffle-haskell-benchmarks
     -Wno-missing-import-lists -Wno-type-defaults
     -Wno-missing-local-signatures -Wno-monomorphism-restriction
     -Wno-prepositive-qualified-module -Wno-missing-safe-haskell-mode
-    -Wno-operator-whitespace
-    -fhide-source-paths -fno-show-valid-hole-fits
-    -fno-sort-valid-hole-fits +RTS -N1 -RTS
+    -Wno-operator-whitespace -fhide-source-paths
+    -fno-show-valid-hole-fits -fno-sort-valid-hole-fits +RTS -N1 -RTS
 
   cxx-options:
     -std=c++17 -D__EMBEDDED_SOUFFLE__ -std=c++17 -march=native