[commit: testsuite] master: Proxy comes from Data.Typeable, Typeable1/2 no longer exist (0f6885e)

José Pedro Magalhães jpm at cs.uu.nl
Wed Feb 13 11:05:06 CET 2013


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0f6885e23486e673ec3e45b2eb435952b61a63c3

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

commit 0f6885e23486e673ec3e45b2eb435952b61a63c3
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Wed Feb 13 10:03:43 2013 +0000

    Proxy comes from Data.Typeable, Typeable1/2 no longer exist

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

 tests/typecheck/should_run/T1735_Help/Basics.hs |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/typecheck/should_run/T1735_Help/Basics.hs b/tests/typecheck/should_run/T1735_Help/Basics.hs
index c7fad91..d444db7 100644
--- a/tests/typecheck/should_run/T1735_Help/Basics.hs
+++ b/tests/typecheck/should_run/T1735_Help/Basics.hs
@@ -21,11 +21,6 @@ module T1735_Help.Basics (
 import Data.Typeable
 import T1735_Help.Context
 
-#ifdef __HADDOCK__
-data Proxy
-#else
-data Proxy (a :: * -> *)
-#endif
 
 ------------------------------------------------------------------------------
 -- The ingenious Data class
@@ -61,14 +56,14 @@ class (Typeable a, Sat (ctx a)) => Data ctx a
      dataTypeOf _ _ = undefined
 
      -- | Mediate types and unary type constructors
-     dataCast1 :: Typeable1 t
+     dataCast1 :: Typeable t
                => Proxy ctx
                -> (forall b. Data ctx b => w (t b))
                -> Maybe (w a)
      dataCast1 _ _ = Nothing
 
      -- | Mediate types and binary type constructors
-     dataCast2 :: Typeable2 t
+     dataCast2 :: Typeable t
                => Proxy ctx
                -> (forall b c. (Data ctx b, Data ctx c) => w (t b c))
                -> Maybe (w a)





More information about the ghc-commits mailing list