[commit: testsuite] master: Fix tests to run without mtl (0407c6b)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0407c6b7aa769d9998cc3818a283438bf9675a99

>---------------------------------------------------------------

commit 0407c6b7aa769d9998cc3818a283438bf9675a99
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat May 19 13:41:35 2012 +0100

    Fix tests to run without mtl

>---------------------------------------------------------------

 tests/codeGen/should_run/cgrun068.hs |    3 ++-
 tests/ghci/scripts/T5979.script      |    6 +++---
 tests/ghci/scripts/T5979.stderr      |    2 +-
 tests/typecheck/should_fail/T5300.hs |    2 +-
 tests/typecheck/should_fail/T5691.hs |    2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/codeGen/should_run/cgrun068.hs b/tests/codeGen/should_run/cgrun068.hs
index f5096ad..9d9a0f9 100644
--- a/tests/codeGen/should_run/cgrun068.hs
+++ b/tests/codeGen/should_run/cgrun068.hs
@@ -31,7 +31,8 @@ import Debug.Trace (trace)
 
 import Control.Exception (assert)
 import Control.Monad
-import Control.Monad.State.Strict
+import Control.Monad.Trans.State.Strict
+import Control.Monad.Trans.Class
 import GHC.Exts
 import GHC.ST hiding (liftST)
 import Prelude hiding (length, read)
diff --git a/tests/ghci/scripts/T5979.script b/tests/ghci/scripts/T5979.script
index a233d3d..2873d7b 100644
--- a/tests/ghci/scripts/T5979.script
+++ b/tests/ghci/scripts/T5979.script
@@ -1,4 +1,4 @@
 :set -XPackageImports
-import "nonexisting" Control.Monad.State
-import "mtl" Control.Monad.State
-import "mtl" Control.Monad.Reader
+import "nonexisting" Control.Monad.Trans.State
+import "transformers" Control.Monad.Trans.State
+import "transformers" Control.Monad.Trans.Reader
diff --git a/tests/ghci/scripts/T5979.stderr b/tests/ghci/scripts/T5979.stderr
index 30bd301..84f8c6b 100644
--- a/tests/ghci/scripts/T5979.stderr
+++ b/tests/ghci/scripts/T5979.stderr
@@ -1,4 +1,4 @@
 
 <no location info>:
-    Could not find module `Control.Monad.State'
+    Could not find module `Control.Monad.Trans.State'
     It is not a module in the current program, or in any known package.
diff --git a/tests/typecheck/should_fail/T5300.hs b/tests/typecheck/should_fail/T5300.hs
index d052d84..b15713d 100644
--- a/tests/typecheck/should_fail/T5300.hs
+++ b/tests/typecheck/should_fail/T5300.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE FunctionalDependencies, MultiParamTypeClasses #-}
 module T5300 where
 
-import Control.Monad.State (StateT)
+import Control.Monad.Trans.State (StateT)
 
 class C1 a b c | a -> b
 class C2 a b c
diff --git a/tests/typecheck/should_fail/T5691.hs b/tests/typecheck/should_fail/T5691.hs
index c63ba7b..49fc776 100644
--- a/tests/typecheck/should_fail/T5691.hs
+++ b/tests/typecheck/should_fail/T5691.hs
@@ -4,7 +4,7 @@ module GHCBug where
 
 import Control.Applicative as Ap
 import Control.Monad (MonadPlus, mplus, mzero)
-import Control.Monad.Identity (Identity, runIdentity)
+import Data.Functor.Identity (Identity, runIdentity)
 
 newtype PrintRuleInterp v = MkPRI { printRule_ :: Int -> String }
 class Test p where