Follow GHC.Bool/GHC.Types merge

diff --git a/Data/Tuple.hs b/Data/Tuple.hs
index 693b8d7..6921a21 100644 (file)
--- a/Data/Tuple.hs
+++ b/Data/Tuple.hs
@@ -44,13 +44,13 @@ module Data.Tuple
 
 import GHC.Base
 -- We need to depend on GHC.Base so that
--- a) so that we get GHC.Bool, GHC.Classes, GHC.Ordering
+-- a) so that we get GHC.Classes, GHC.Ordering, GHC.Types
 
 -- b) so that GHC.Base.inline is available, which is used
 --    when expanding instance declarations
 
 import GHC.Tuple
--- We must import GHC.Tuple, to ensure sure that the 
+-- We must import GHC.Tuple, to ensure sure that the
 -- data constructors of `(,)' are in scope when we do
 -- the standalone deriving instance for Eq (a,b) etc
 

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index 027191a..8dd3124 100644 (file)
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -87,7 +87,6 @@ Other Prelude modules are much easier with fewer complex dependencies.
 module GHC.Base
         (
         module GHC.Base,
-        module GHC.Bool,
         module GHC.Classes,
         module GHC.Generics,
         module GHC.Ordering,
@@ -98,7 +97,6 @@ module GHC.Base
         where
 
 import GHC.Types
-import GHC.Bool
 import GHC.Classes
 import GHC.Generics
 import GHC.Ordering

diff --git a/GHC/Classes.hs b/GHC/Classes.hs
index 3e3e72f..2934d1d 100644 (file)
--- a/GHC/Classes.hs
+++ b/GHC/Classes.hs
@@ -19,7 +19,6 @@
 
 module GHC.Classes where
 
-import GHC.Bool
 import GHC.Integer
 -- GHC.Magic is used in some derived instances
 import GHC.Magic ()

diff --git a/GHC/Unicode.hs-boot b/GHC/Unicode.hs-boot
index c9a4a9d..6a0e75c 100644 (file)
--- a/GHC/Unicode.hs-boot
+++ b/GHC/Unicode.hs-boot
@@ -2,7 +2,6 @@
 
 module GHC.Unicode where
 
-import GHC.Bool
 import GHC.Types
 
 isAscii         :: Char -> Bool