Follow GHC.Bool/GHC.Types merge

testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout

@@ -34,8 +34,8 @@ class Monad m where
 catMaybes :: [Maybe a] -> [a]
 fromJust :: Maybe a -> a
 fromMaybe :: a -> Maybe a -> a
-isJust :: Maybe a -> GHC.Bool.Bool
-isNothing :: Maybe a -> GHC.Bool.Bool
+isJust :: Maybe a -> GHC.Types.Bool
+isNothing :: Maybe a -> GHC.Types.Bool
 listToMaybe :: [a] -> Maybe a
 mapMaybe :: (a -> Maybe b) -> [a] -> [b]
 maybe :: b -> (a -> b) -> Maybe a -> b
@@ -48,8 +48,8 @@ Nothing :: Maybe a
 (+) :: GHC.Num.Num a => a -> a -> a
 (=<<) :: Monad m => (a -> m b) -> m a -> m b
 class Eq a where
-  (GHC.Classes.==) :: a -> a -> GHC.Bool.Bool
-  (GHC.Classes./=) :: a -> a -> GHC.Bool.Bool
+  (GHC.Classes.==) :: a -> a -> GHC.Types.Bool
+  (GHC.Classes./=) :: a -> a -> GHC.Types.Bool
 -- imported via Prelude, T
 Prelude.length :: [a] -> GHC.Types.Int
 -- imported via T

testsuite/tests/ghc-regress/module/base01/GHC/Base.hs

 
 module GHC.Base (module GHC.Base, Bool(..)) where
 
-import GHC.Bool
 import GHC.Prim
+import GHC.Types
 
 default ()
 

testsuite/tests/ghc-regress/simplCore/should_compile/T3717.stderr

@@ -16,7 +16,7 @@ T3717.$wfoo =
     case ww of ds {
       __DEFAULT ->
         case case GHC.Prim.<# ds 5 of _ {
-               GHC.Bool.False -> lvl1; GHC.Bool.True -> lvl
+               GHC.Types.False -> lvl1; GHC.Types.True -> lvl
              }
         of _ { __DEFAULT ->
         T3717.$wfoo (GHC.Prim.-# ds 1)

testsuite/tests/ghc-regress/simplCore/should_compile/T3772.stdout

@@ -6,8 +6,8 @@ xs :: GHC.Prim.Int# -> ()
 xs =
   \ (m :: GHC.Prim.Int#) ->
     case GHC.Prim.<=# m 1 of _ {
-      GHC.Bool.False -> xs (GHC.Prim.-# m 1);
-      GHC.Bool.True -> GHC.Unit.()
+      GHC.Types.False -> xs (GHC.Prim.-# m 1);
+      GHC.Types.True -> GHC.Unit.()
     }
 end Rec }
 
@@ -17,7 +17,7 @@ T3772.foo =
   \ (n :: GHC.Types.Int) ->
     case n of _ { GHC.Types.I# n# ->
     case GHC.Prim.<=# n# 0 of _ {
-      GHC.Bool.False -> xs n#; GHC.Bool.True -> GHC.Unit.()
+      GHC.Types.False -> xs n#; GHC.Types.True -> GHC.Unit.()
     }
     }
 

testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr

@@ -41,17 +41,17 @@ Roman.foo_$s$wgo1 =
              sc)
           sc } in
     case GHC.Prim.<=# sc1 0 of _ {
-      GHC.Bool.False ->
+      GHC.Types.False ->
         case GHC.Prim.<# sc1 100 of _ {
-          GHC.Bool.False ->
+          GHC.Types.False ->
             case GHC.Prim.<# sc1 500 of _ {
-              GHC.Bool.False ->
+              GHC.Types.False ->
                 Roman.foo_$s$wgo1 (GHC.Prim.+# a a) (GHC.Prim.-# sc1 1);
-              GHC.Bool.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# sc1 3)
+              GHC.Types.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# sc1 3)
             };
-          GHC.Bool.True -> Roman.foo_$s$wgo1 sc (GHC.Prim.-# sc1 2)
+          GHC.Types.True -> Roman.foo_$s$wgo1 sc (GHC.Prim.-# sc1 2)
         };
-      GHC.Bool.True -> 0
+      GHC.Types.True -> 0
     }
 end Rec }
 
@@ -77,17 +77,17 @@ Roman.foo_$s$wgo =
              ipv)
           ipv } in
     case GHC.Prim.<=# sc1 0 of _ {
-      GHC.Bool.False ->
+      GHC.Types.False ->
         case GHC.Prim.<# sc1 100 of _ {
-          GHC.Bool.False ->
+          GHC.Types.False ->
             case GHC.Prim.<# sc1 500 of _ {
-              GHC.Bool.False ->
+              GHC.Types.False ->
                 Roman.foo_$s$wgo1 (GHC.Prim.+# a a) (GHC.Prim.-# sc1 1);
-              GHC.Bool.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# sc1 3)
+              GHC.Types.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# sc1 3)
             };
-          GHC.Bool.True -> Roman.foo_$s$wgo1 ipv (GHC.Prim.-# sc1 2)
+          GHC.Types.True -> Roman.foo_$s$wgo1 ipv (GHC.Prim.-# sc1 2)
         };
-      GHC.Bool.True -> 0
+      GHC.Types.True -> 0
     }
     }
 
@@ -126,17 +126,17 @@ Roman.$wgo =
           Data.Maybe.Just n ->
             case n of _ { GHC.Types.I# x2 ->
             case GHC.Prim.<=# x2 0 of _ {
-              GHC.Bool.False ->
+              GHC.Types.False ->
                 case GHC.Prim.<# x2 100 of _ {
-                  GHC.Bool.False ->
+                  GHC.Types.False ->
                     case GHC.Prim.<# x2 500 of _ {
-                      GHC.Bool.False ->
+                      GHC.Types.False ->
                         Roman.foo_$s$wgo1 (GHC.Prim.+# a a) (GHC.Prim.-# x2 1);
-                      GHC.Bool.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# x2 3)
+                      GHC.Types.True -> Roman.foo_$s$wgo1 a (GHC.Prim.-# x2 3)
                     };
-                  GHC.Bool.True -> Roman.foo_$s$wgo x1 (GHC.Prim.-# x2 2)
+                  GHC.Types.True -> Roman.foo_$s$wgo x1 (GHC.Prim.-# x2 2)
                 };
-              GHC.Bool.True -> 0
+              GHC.Types.True -> 0
             }
             }
         }

testsuite/tests/ghc-regress/th/T2700.stderr

-foo :: (GHC.Types.Int -> GHC.Bool.Bool) -> GHC.Bool.Bool
+foo :: (GHC.Types.Int -> GHC.Types.Bool) -> GHC.Types.Bool