Remove the haskell98 dependency from more tests

testsuite/tests/ghc-regress/array/should_run/arr016.hs

@@ -7,14 +7,14 @@ module Main where
  -
  -}
 
-import qualified Array
-import List
-import Monad ( liftM2, liftM3, liftM4 )
-import Random
+import qualified Data.Array as Array
+import Data.List
+import Control.Monad ( liftM2, liftM3, liftM4 )
+import System.Random
 
 
-import Ix
-import List( (\\) )
+import Data.Ix
+import Data.List( (\\) )
 
 infixl 9  !, //
 infixr 0 ==>

testsuite/tests/ghc-regress/cabal/pkg01.hs

-module Char where
--- conflicts with module from haskell98 package
-import IO
+module Data.Map where
+-- conflicts with module from containers package
+import Data.Set

testsuite/tests/ghc-regress/driver/recomp003/A.hs

 module A where
-import Char
+import Data.Char
 

testsuite/tests/ghc-regress/driver/recomp003/Makefile

@@ -8,10 +8,10 @@ OBJSUFFIX = .o
 # recompilation.  Part of bug #1372.
 recomp003:
 	$(RM) A.hi A$(OBJSUFFIX) out
-	$(RM) Char.hs Char.hi Char$(OBJSUFFIX)
+	$(RM) Data/Char.hs Data/Char.hi Data/Char$(OBJSUFFIX)
 	'$(TEST_HC)' -c A.hs
-	echo "module Char where" >Char.hs
-	'$(TEST_HC)' -c Char.hs
+	echo "module Data.Char where" > Data/Char.hs
+	'$(TEST_HC)' -c Data/Char.hs
 	# Should now recompile A.hs, because Char is now a home module:
 	'$(TEST_HC)' -c A.hs 2>err
 	@if grep NOT err; then false; fi

testsuite/tests/ghc-regress/driver/recomp003/all.T

 test('recomp003',
-     extra_clean(['Char.hs', 'err']),
+     extra_clean(['Data/Char.hs', 'Data/Char.hi', 'Data/Char.o',
+                  'A.o', 'A.hi',
+                  'err']),
      run_command,
      ['$MAKE -s --no-print-directory recomp003'])

testsuite/tests/ghc-regress/ffi/should_run/fed001.hs

+import Control.Monad
 import Foreign
-import Monad
 import Foreign.Ptr
 
 type CInt  = Int32

testsuite/tests/ghc-regress/indexed-types/should_compile/HO.hs

@@ -2,7 +2,6 @@
 
 module HO where 
 
-import IO
 import Data.IORef
 
 type family SMRef    (m::(* -> *)) :: * -> *

testsuite/tests/ghc-regress/indexed-types/should_compile/HO.stderr

 
-HO.hs:15:1:
+HO.hs:14:1:
     Alas, GHC 7.0 still cannot handle equality superclasses:
       SMMonad (SMRef m) ~ m
     In the context: (SMMonad (SMRef m) ~ m)

testsuite/tests/ghc-regress/indexed-types/should_run/GMapAssoc.hs

@@ -3,7 +3,7 @@
 module Main where
 
 import Prelude hiding (lookup)
-import Char (ord)
+import Data.Char (ord)
 import qualified Data.Map as Map
 
 

testsuite/tests/ghc-regress/indexed-types/should_run/GMapTop.hs

@@ -3,7 +3,7 @@
 module Main where
 
 import Prelude hiding (lookup)
-import Char (ord)
+import Data.Char (ord)
 import qualified Data.Map as Map
 
 

testsuite/tests/ghc-regress/indexed-types/should_run/T4235.hs

 {-# LANGUAGE TypeFamilies, StandaloneDeriving, FlexibleInstances, GADTs #-}
 module Main where
 
-import Ix
+import Data.Ix
 
 -- Deriving Enum with phantom type parameter
 data T a = R | S | T deriving( Enum, Show )

testsuite/tests/ghc-regress/lib/Data.List/genericNegative001.hs

 -- Test for http://hackage.haskell.org/trac/ghc/ticket/2533
 import System.Environment
-import List
+import Data.List
 main = do 
  (n:_) <- getArgs
  print (genericTake (read n) "none taken")

testsuite/tests/ghc-regress/mdo/should_compile/mdo005.hs

@@ -5,7 +5,7 @@
 module Main (main) where
 
 import Control.Monad.Fix 
-import Maybe ( fromJust )
+import Data.Maybe ( fromJust )
 
 t = mdo x <- fromJust (mdo x <- Just (1:x)
 			   return (take 4 x))

testsuite/tests/ghc-regress/mdo/should_run/mdorun001.hs

@@ -4,7 +4,7 @@ module Main(main) where
 
 import Control.Monad.Fix
 import Data.Array.IO
-import Monad
+import Control.Monad
 
 norm a = mdo (_, sz) <- getBounds a
 	     s <- ioaA 1 s sz 0

testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs

@@ -11,7 +11,7 @@
 
 module DoRestrictedM where
 
-import List
+import Data.List
 import Prelude (const, String, ($), (.), Maybe(..))
 import qualified Prelude
 import qualified Data.Set as Set

testsuite/tests/ghc-regress/simplCore/prog002/Simpl009Help.hs

@@ -4,7 +4,7 @@
 
 module Simpl009Help where
   
-import Monad
+import Control.Monad
 
 newtype Parser s a
   = Parser (forall res . (a -> [String] -> P s res) -> [String] -> P s res)

testsuite/tests/ghc-regress/simplCore/prog002/simpl009.hs

@@ -9,7 +9,7 @@
 
 module FormParse where
   
-import Monad
+import Control.Monad
 import Simpl009Help
 
 identifier :: Parser Char Char

testsuite/tests/ghc-regress/stranal/should_run/strun003.hs

@@ -5,7 +5,9 @@
 -- See the io_hack_reqd in DmdAnal.lhs
 
 module Main where
-import System
+
+import System.Environment
+import System.Exit
 
 main    = do
             args <- getArgs

testsuite/tests/ghc-regress/th/T4188.hs

@@ -3,7 +3,7 @@
 module T4188 where
 
 import Language.Haskell.TH
-import IO
+import System.IO
 
 class C a where {}