projects
/
ghc-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3bdf1d
)
Roll back generics changes in the HEAD repos
author
Ian Lynagh
<igloo@earth.li>
Sat, 19 Feb 2011 13:31:42 +0000
(13:31 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 19 Feb 2011 13:31:42 +0000
(13:31 +0000)
GHC/Base.lhs
patch
|
blob
|
history
diff --git
a/GHC/Base.lhs
b/GHC/Base.lhs
index
1a5ce0d
..
be1b57b
100644
(file)
--- a/
GHC/Base.lhs
+++ b/
GHC/Base.lhs
@@
-97,8
+97,7
@@
module GHC.Base
(
module GHC.Base,
module GHC.Classes,
(
module GHC.Base,
module GHC.Classes,
- --module GHC.Generics, -- JPM: We no longer export GHC.Generics
- -- by default to avoid name clashes
+ module GHC.Generics,
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
@@
-108,8
+107,7
@@
module GHC.Base
import GHC.Types
import GHC.Classes
import GHC.Types
import GHC.Classes
--- JPM: Since we don't export it, we don't need to import GHC.Generics
---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