diff options
7 files changed, 13 insertions, 13 deletions
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T index 6fce23544d..4c91099b15 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T @@ -69,7 +69,7 @@ test('tc061', normal, compile, ['']) test('tc062', normal, compile, ['']) test('tc063', normal, compile, ['']) test('tc064', normal, compile, ['']) -test('tc065', normal, compile, ['-package lang -package data']) +test('tc065', normal, compile, ['']) test('tc066', normal, compile, ['']) test('tc067', normal, compile, ['']) test('tc068', normal, compile, ['']) @@ -85,10 +85,10 @@ test('tc080', normal, compile, ['']) test('tc081', normal, compile, ['']) test('tc082', normal, compile, ['']) test('tc084', normal, compile, ['']) -test('tc085', normal, compile, ['-package lang']) +test('tc085', normal, compile, ['']) test('tc086', normal, compile, ['']) test('tc087', normal, compile, ['-fglasgow-exts']) -test('tc088', normal, compile, ['-package lang']) +test('tc088', normal, compile, ['']) test('tc089', normal, compile, ['']) test('tc090', normal, compile, ['']) test('tc091', normal, compile, ['']) @@ -131,7 +131,7 @@ test('tc128', normal, compile, ['']) test('tc129', normal, compile, ['']) test('tc130', normal, compile, ['']) test('tc131', normal, compile, ['']) -test('tc132', normal, compile, ['-package lang']) +test('tc132', normal, compile, ['']) test('tc133', normal, compile, ['']) test('tc134', normal, compile, ['']) test('tc135', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs index 8ea71eec9d..331a92e70e 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs @@ -1,8 +1,8 @@ module ShouldSucceed where -- import TheUtils -import Set -import List (partition ) +import Data.Set +import Data.List (partition ) data Digraph vertex = MkDigraph [vertex] diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs index 5b45520a2a..fe6fc902a3 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs @@ -1,9 +1,8 @@ {-# OPTIONS -fglasgow-exts #-} -- !!! From a bug report from Satnam. -- !!! To do with re-exporting importees from PreludeGla* modules. -module ShouldSucceed ( module IOExts, module GHC.Prim ) where +module ShouldSucceed ( module GHC.Prim ) where -import IOExts import GHC.Prim type FooType = Int diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs index d140285f02..f32e6dc6bc 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs @@ -3,7 +3,8 @@ -- Fails with GHC 5.00.1 module Test where -import ST +import Control.Monad.ST +import Data.STRef -- Should get -- apa :: forall s. ST s () diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T b/testsuite/tests/ghc-regress/typecheck/should_fail/all.T index 8930a8675a..29d114da9c 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/all.T @@ -66,7 +66,7 @@ test('tcfail076', normal, compile_fail, ['']) test('tcfail077', normal, compile_fail, ['']) test('tcfail078', normal, compile_fail, ['']) test('tcfail079', normal, compile_fail, ['']) -test('tcfail080', expect_fail, compile_fail, ['-fglasgow-exts -package lang']) +test('tcfail080', expect_fail, compile_fail, ['-fglasgow-exts']) test('tcfail082', normal, compile_fail, ['']) test('tcfail083', normal, compile_fail, ['']) test('tcfail084', normal, compile_fail, ['']) diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/all.T b/testsuite/tests/ghc-regress/typecheck/should_run/all.T index 6223917213..655e50cab7 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/all.T +++ b/testsuite/tests/ghc-regress/typecheck/should_run/all.T @@ -24,7 +24,7 @@ test('tcrun018', normal, compile_and_run, ['']) test('tcrun019', normal, compile_and_run, ['']) test('tcrun020', normal, compile_and_run, ['']) # Doesn't work with External Core due to datatype with no constructors -test('tcrun021', expect_fail_for(['extcore','optextcore']), compile_and_run, ['-package data']) +test('tcrun021', expect_fail_for(['extcore','optextcore']), compile_and_run, ['']) test('tcrun022', normal, compile_and_run, ['-O -fglasgow-exts']) test('tcrun023', normal, compile_and_run, ['-O']) test('tcrun024', normal, compile_and_run, ['-O']) diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs index e23a0c2a7e..4a575595f1 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs @@ -6,8 +6,8 @@ module Main where -import List -import FiniteMap +import Data.List +import Data.FiniteMap class (Ord oid) => Object o oid | o -> oid where |