Remove redundant import; fix note
authorDavid Feuer <david.feuer@gmail.com>
Tue, 11 Jul 2017 19:28:49 +0000 (15:28 -0400)
committerBen Gamari <ben@smart-cactus.org>
Tue, 11 Jul 2017 20:32:43 +0000 (16:32 -0400)
* Remove the redundant import of `Data.Maybe` from `GHC.Foreign`.

* Fix the note in `GHC.Stack.Types` to give a correct explanation
of the problematic cycle.

Reviewers: austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie

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

libraries/base/GHC/Foreign.hs
libraries/base/GHC/Stack/Types.hs

index 6d2f8c1..eb5e853 100644 (file)
@@ -49,7 +49,6 @@ import Data.Word
 -- Imports for the locale-encoding version of marshallers
 
 import Data.Tuple (fst)
-import Data.Maybe
 
 import GHC.Show ( show )
 
index 29be6d6..54352b1 100644 (file)
@@ -41,12 +41,10 @@ Ideally these would live in GHC.Stack but sadly they can't due to this
 import cycle,
 
     Module imports form a cycle:
-           module ‘Data.Maybe’ (libraries/base/Data/Maybe.hs)
-          imports ‘GHC.Base’ (libraries/base/GHC/Base.hs)
-    which imports ‘GHC.Err’ (libraries/base/GHC/Err.hs)
+           module ‘GHC.Base’ (libraries/base/GHC/Base.hs)
+          imports ‘GHC.Err’ (libraries/base/GHC/Err.hs)
     which imports ‘GHC.Stack’ (libraries/base/dist-install/build/GHC/Stack.hs)
-    which imports ‘GHC.Foreign’ (libraries/base/GHC/Foreign.hs)
-    which imports ‘Data.Maybe’ (libraries/base/Data/Maybe.hs)
+    which imports ‘GHC.Base‘ (libraries/base/GHC/Base.hs)
 -}
 
 import GHC.Classes (Eq)