[commit: base] ghc-generics1: Move Functor from base to ghc-prim (fdf6be9)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/fdf6be960db739b93dae23a3c0fcf16d64b88626

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

commit fdf6be960db739b93dae23a3c0fcf16d64b88626
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Sun Apr 22 10:07:39 2012 +0200

    Move Functor from base to ghc-prim
    
    This is because deriving Generic1 uses Functor,
    and haddock seems to trip on that. This is not an ideal
    fix, though, and I hope to change it back in the future.

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

 GHC/Base.lhs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index 6a36eb5..c40e55d 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -123,7 +123,6 @@ import GHC.Integer ()
 
 infixr 9  .
 infixr 5  ++
-infixl 4  <$
 infixl 1  >>, >>=
 infixr 0  $
 
@@ -174,7 +173,7 @@ Instances of 'Functor' should satisfy the following laws:
 The instances of 'Functor' for lists, 'Data.Maybe.Maybe' and 'System.IO.IO'
 satisfy these laws.
 -}
-
+{-
 class  Functor f  where
     fmap        :: (a -> b) -> f a -> f b
 
@@ -183,7 +182,7 @@ class  Functor f  where
     -- overridden with a more efficient version.
     (<$)        :: a -> f b -> f a
     (<$)        =  fmap . const
-
+-}
 {- | The 'Monad' class defines the basic operations over a /monad/,
 a concept from a branch of mathematics known as /category theory/.
 From the perspective of a Haskell programmer, however, it is best to