projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial commit for Pedro's generic-default mechanism
[ghc-base.git]
/
GHC
/
Base.lhs
diff --git
a/GHC/Base.lhs
b/GHC/Base.lhs
index
be1b57b
..
1a5ce0d
100644
(file)
--- a/
GHC/Base.lhs
+++ b/
GHC/Base.lhs
@@
-97,7
+97,8
@@
module GHC.Base
(
module GHC.Base,
module GHC.Classes,
(
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
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.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
import GHC.Ordering
import GHC.Prim
import {-# SOURCE #-} GHC.Show