Move `Maybe`-typedef into GHC.Base

This is preparatory work for reintroducing SPECIALISEs that were lost
in d94de87252d0fe2ae97341d186b03a2fbe136b04

Differential Revision: https://phabricator.haskell.org/D214

3 files changed, 22 insertions, 22 deletions

diff --git a/testsuite/tests/ghci/scripts/T4175.stdout b/testsuite/tests/ghci/scripts/T4175.stdout
index 2a75b0da6a..e439528965 100644
--- a/testsuite/tests/ghci/scripts/T4175.stdout
+++ b/testsuite/tests/ghci/scripts/T4175.stdout
@@ -28,14 +28,14 @@ instance Show () -- Defined in ‘GHC.Show’
 type instance D () () = Bool 	-- Defined at T4175.hs:22:5
 type instance D Int () = String 	-- Defined at T4175.hs:19:5
 data instance B () = MkB 	-- Defined at T4175.hs:13:15
-data Maybe a = Nothing | Just a 	-- Defined in ‘Data.Maybe’
-instance Eq a => Eq (Maybe a) -- Defined in ‘Data.Maybe’
-instance Monad Maybe -- Defined in ‘Data.Maybe’
-instance Functor Maybe -- Defined in ‘Data.Maybe’
-instance Ord a => Ord (Maybe a) -- Defined in ‘Data.Maybe’
+data Maybe a = Nothing | Just a 	-- Defined in ‘GHC.Base’
+instance Eq a => Eq (Maybe a) -- Defined in ‘GHC.Base’
+instance Monad Maybe -- Defined in ‘GHC.Base’
+instance Functor Maybe -- Defined in ‘GHC.Base’
+instance Ord a => Ord (Maybe a) -- Defined in ‘GHC.Base’
 instance Read a => Read (Maybe a) -- Defined in ‘GHC.Read’
 instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’
-instance Applicative Maybe -- Defined in ‘Data.Maybe’
+instance Applicative Maybe -- Defined in ‘GHC.Base’
 instance Foldable Maybe -- Defined in ‘Data.Foldable’
 instance Traversable Maybe -- Defined in ‘Data.Traversable’
 type instance A (Maybe a) a = a 	-- Defined at T4175.hs:9:1
diff --git a/testsuite/tests/ghci/scripts/ghci023.stdout b/testsuite/tests/ghci/scripts/ghci023.stdout
index 5f19876614..51c1b9196a 100644
--- a/testsuite/tests/ghci/scripts/ghci023.stdout
+++ b/testsuite/tests/ghci/scripts/ghci023.stdout
@@ -1,7 +1,6 @@
 -- testing ghci multiline commands :{ .. :}
 -- via stdin
 (1,2,3)
-data Maybe a = Nothing | Just a
 Data.Maybe.catMaybes :: [Maybe a] -> [a]
 Data.Maybe.fromJust :: Maybe a -> a
 Data.Maybe.fromMaybe :: a -> Maybe a -> a
@@ -11,6 +10,7 @@ Data.Maybe.listToMaybe :: [a] -> Maybe a
 Data.Maybe.mapMaybe :: (a -> Maybe b) -> [a] -> [b]
 maybe :: b -> (a -> b) -> Maybe a -> b
 Data.Maybe.maybeToList :: Maybe a -> [a]
+data Maybe a = Nothing | Just a
 -- via readFile
 (True,False)
 id :: a -> a
diff --git a/testsuite/tests/ghci/scripts/ghci026.stdout b/testsuite/tests/ghci/scripts/ghci026.stdout
index 163cca29b6..9fb27908e6 100644
--- a/testsuite/tests/ghci/scripts/ghci026.stdout
+++ b/testsuite/tests/ghci/scripts/ghci026.stdout
@@ -1,15 +1,15 @@
-data Maybe a = Nothing | Just a

-catMaybes :: [Maybe a] -> [a]

-fromJust :: Maybe a -> a

-fromMaybe :: a -> Maybe a -> a

-isJust :: Maybe a -> Bool

-isNothing :: Maybe a -> Bool

-listToMaybe :: [a] -> Maybe a

-mapMaybe :: (a -> Maybe b) -> [a] -> [b]

-maybe :: b -> (a -> b) -> Maybe a -> b

-maybeToList :: Maybe a -> [a]

-data T = A Int | B Float

-f :: Double -> Double

-g :: Double -> Double

-h :: Integral a => a -> a

-f :: Double -> Double

+catMaybes :: [Maybe a] -> [a]
+fromJust :: Maybe a -> a
+fromMaybe :: a -> Maybe a -> a
+isJust :: Maybe a -> Bool
+isNothing :: Maybe a -> Bool
+listToMaybe :: [a] -> Maybe a
+mapMaybe :: (a -> Maybe b) -> [a] -> [b]
+maybe :: b -> (a -> b) -> Maybe a -> b
+maybeToList :: Maybe a -> [a]
+data Maybe a = Nothing | Just a
+data T = A Int | B Float
+f :: Double -> Double
+g :: Double -> Double
+h :: Integral a => a -> a
+f :: Double -> Double