Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/401ecbeaf6152b46cdb053fb55fc6642a9be3646 >--------------------------------------------------------------- commit 401ecbeaf6152b46cdb053fb55fc6642a9be3646 Author: David Terei <[email protected]> Date: Tue Jul 12 13:43:08 2011 -0700 More THREAD fixes to safe haskell tests >--------------------------------------------------------------- .../safeHaskell/safeLanguage/SafeLang06_A.hs | 2 +- .../safeHaskell/safeLanguage/SafeLang07.hs | 3 +-- .../safeHaskell/safeLanguage/SafeLang07.stderr | 8 +++----- .../{SafeLang06_A.hs => SafeLang07_A.hs} | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs index 07aad17..d092ae7 100644 --- a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs +++ b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs @@ -17,7 +17,7 @@ newMinList n = MinList n [] insertMinList :: Ord a => MinList a -> a -> MinList a insertMinList s@(MinList m xs) n | n > m = MinList m (n:xs) - | otherwise = s + | otherwise = s printIntMinList :: MinList Int -> IO () printIntMinList (MinList min xs) = putStrLn $ "MinList Int :: MinList " ++ show min ++ " " ++ show xs diff --git a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs index 7721382..006cd0e 100644 --- a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs +++ b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs @@ -12,7 +12,7 @@ -- API of Y1. module Main where -import SafeLang06_A +import SafeLang07_A class IntIso t where intIso :: c t -> c Int @@ -39,4 +39,3 @@ main = do printIntMinList a1 printIntMinList a2 - diff --git a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr index b1e2526..1218b29 100644 --- a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr +++ b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr @@ -2,8 +2,6 @@ <no location info>: Warning: -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving -SafeLang07.hs:23:45: - Can't make a derived instance of `IntIso (Down a)': - `IntIso' is not a derivable class - Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension - In the newtype declaration for `Down' +SafeLang07.hs:15:1: + Failed to load interface for `SafeLang07_A' + Use -v to see a list of the files searched for. diff --git a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07_A.hs similarity index 90% copy from tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs copy to tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07_A.hs index 07aad17..6ef49d5 100644 --- a/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs +++ b/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07_A.hs @@ -3,7 +3,7 @@ -- | Here we expose a MinList API that only allows elements -- to be inserted into a list if they are at least greater -- than an initial element the list is created with. -module SafeLang06_A ( +module SafeLang07_A ( MinList, newMinList, insertMinList, @@ -17,7 +17,7 @@ newMinList n = MinList n [] insertMinList :: Ord a => MinList a -> a -> MinList a insertMinList s@(MinList m xs) n | n > m = MinList m (n:xs) - | otherwise = s + | otherwise = s printIntMinList :: MinList Int -> IO () printIntMinList (MinList min xs) = putStrLn $ "MinList Int :: MinList " ++ show min ++ " " ++ show xs _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
