Support mtl-2.3

core-tests/Resources.hs

@@ -7,7 +7,7 @@ import Test.Tasty.Options
 import Test.Tasty.Runners
 import Test.Tasty.HUnit
 import Control.Concurrent
-import Control.Monad.Writer
+import Control.Monad (void)
 import qualified Data.IntMap as IntMap
 import Data.Maybe
 import Data.Foldable

core-tests/failing-pattern-test.hs

@@ -3,7 +3,8 @@ import Test.Tasty.Options
 import Test.Tasty.HUnit
 import Data.Typeable
 import System.Random
-import Control.Monad.State
+import Control.Monad (replicateM)
+import Control.Monad.State (State, state, evalState)
 
 newtype Seed = Seed Int
   deriving Typeable

core/Test/Tasty/Ingredients/ConsoleReporter.hs

@@ -27,8 +27,10 @@ module Test.Tasty.Ingredients.ConsoleReporter
   ) where
 
 import Prelude hiding (fail, EQ)
-import Control.Monad.State hiding (fail)
-import Control.Monad.Reader hiding (fail,reader)
+import Control.Monad (join, unless, void, when, (<=<))
+import Control.Monad.IO.Class (liftIO)
+import Control.Monad.Reader (Reader, runReader, ask)
+import Control.Monad.State (evalState, evalStateT, get, modify, put)
 import Control.Concurrent.STM
 import Control.Exception
 import Test.Tasty.Core

core/Test/Tasty/Patterns/Eval.hs

@@ -2,7 +2,8 @@
 module Test.Tasty.Patterns.Eval (Path, eval, withFields, asB) where
 
 import Prelude hiding (Ordering(..))
-import Control.Monad.Reader
+import Control.Monad ((<=<))
+import Control.Monad.Reader (ReaderT, runReaderT, ask)
 import Control.Monad.Error.Class (throwError) -- see #201
 import qualified Data.Sequence as Seq
 import Data.Foldable

core/Test/Tasty/Run.hs

@@ -14,16 +14,18 @@ import qualified Data.Foldable as F
 import Data.Maybe
 import Data.Graph (SCC(..), stronglyConnComp)
 import Data.Typeable
-import Control.Monad.State
-import Control.Monad.Writer
-import Control.Monad.Reader
+import Control.Monad (forever, guard, join, liftM)
+import Control.Monad.IO.Class (liftIO)
+import Control.Monad.Reader (ReaderT(..), local, ask)
+import Control.Monad.Writer (WriterT(..), execWriterT, tell)
 import Control.Concurrent
 import Control.Concurrent.STM
 import Control.Concurrent.Timeout (timeout)
 import Control.Concurrent.Async
 import Control.Exception as E
 import Control.Applicative
 import Control.Arrow
+import Data.Monoid (First(..))
 import GHC.Conc (labelThread)
 import Prelude  -- Silence AMP and FTP import warnings