diff options
| author | David Feuer <david.feuer@gmail.com> | 2017-07-11 15:28:49 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-07-11 16:32:43 -0400 |
| commit | 3a163aabe7948d382393e9e81f1239f3e06b222b (patch) | |
| tree | d6b633b5515fe37753c7ee2af80634d661d6dc23 | |
| parent | a0d9169362b4cc47f8eb323f96dd18e6e9c6728a (diff) | |
| download | haskell-3a163aabe7948d382393e9e81f1239f3e06b222b.tar.gz | |
Remove redundant import; fix note
* 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
| -rw-r--r-- | libraries/base/GHC/Foreign.hs | 1 | ||||
| -rw-r--r-- | libraries/base/GHC/Stack/Types.hs | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libraries/base/GHC/Foreign.hs b/libraries/base/GHC/Foreign.hs index 6d2f8c1a56..eb5e853b38 100644 --- a/libraries/base/GHC/Foreign.hs +++ b/libraries/base/GHC/Foreign.hs @@ -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 ) diff --git a/libraries/base/GHC/Stack/Types.hs b/libraries/base/GHC/Stack/Types.hs index 29be6d6e8d..54352b19de 100644 --- a/libraries/base/GHC/Stack/Types.hs +++ b/libraries/base/GHC/Stack/Types.hs @@ -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) |