[commit: base] ghc-generics: Initial commit for Pedro's generic-default mechanism (dfbc01d)

[Simon Peyton Jones]

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

On branch  : ghc-generics

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

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

commit dfbc01d590acb27e9b40df1693e888531376738e
Author: simonpj <simonpj at cam-04-unx.europe.corp.microsoft.com>
Date:   Tue Apr 12 17:48:42 2011 +0100

    Initial commit for Pedro's generic-default mechanism

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

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

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index be1b57b..1a5ce0d 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -97,7 +97,8 @@ module GHC.Base
         (
         module GHC.Base,
         module GHC.Classes,
-        module GHC.Generics,
+        --module GHC.Generics,        -- JPM: We no longer export GHC.Generics
+                                      -- by default to avoid name clashes
         module GHC.Ordering,
         module GHC.Types,
         module GHC.Prim,        -- Re-export GHC.Prim and GHC.Err, to avoid lots
@@ -107,7 +108,8 @@ module GHC.Base
 
 import GHC.Types
 import GHC.Classes
-import GHC.Generics
+-- JPM: Since we don't export it, we don't need to import GHC.Generics
+--import GHC.Generics
 import GHC.Ordering
 import GHC.Prim
 import {-# SOURCE #-} GHC.Show