[commit: ghc] master: Three other test updates following the fix to Trac #7854 (9dc0d63)

git at git.haskell.org git at git.haskell.org
Wed Mar 4 13:45:53 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9dc0d63cd7231392320e4afcfe78102801126d34/ghc

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

commit 9dc0d63cd7231392320e4afcfe78102801126d34
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Mar 4 13:20:28 2015 +0000

    Three other test updates following the fix to Trac #7854


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

9dc0d63cd7231392320e4afcfe78102801126d34
 testsuite/tests/deriving/should_fail/T8851.hs | 2 +-
 testsuite/tests/ghci/prog008/A.hs             | 1 +
 testsuite/tests/ghci/scripts/ghci025.hs       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/deriving/should_fail/T8851.hs b/testsuite/tests/deriving/should_fail/T8851.hs
index 84f0ad4..8b5c0e5 100644
--- a/testsuite/tests/deriving/should_fail/T8851.hs
+++ b/testsuite/tests/deriving/should_fail/T8851.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, ConstrainedClassMethods #-}
 
 module T8851 where
 
diff --git a/testsuite/tests/ghci/prog008/A.hs b/testsuite/tests/ghci/prog008/A.hs
index 6a85ca7..d724bd2 100644
--- a/testsuite/tests/ghci/prog008/A.hs
+++ b/testsuite/tests/ghci/prog008/A.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
+{-# LANGUAGE AllowAmbiguousTypes #-} -- c3 is ambiguous!
 
 -- Tests a bug spotted by Claus in which the type
 -- of c3 was wrongly displayed in GHCi as
diff --git a/testsuite/tests/ghci/scripts/ghci025.hs b/testsuite/tests/ghci/scripts/ghci025.hs
index d5e2673..b556509 100644
--- a/testsuite/tests/ghci/scripts/ghci025.hs
+++ b/testsuite/tests/ghci/scripts/ghci025.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
+{-# LANGUAGE AllowAmbiguousTypes #-} -- c3 is ambiguous!
 
 module T where
 



More information about the ghc-commits mailing list