diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-09-26 21:09:56 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-09-26 21:12:01 +0200 |
| commit | 319703ee0c97c593be514222fdee06555816cda4 (patch) | |
| tree | 72052ffc9f58ad7809c636d6e6a4a28207fa7718 /ghc | |
| parent | c5f65c6dadd3f6f3e1ba8a7d0cec25ede1561339 (diff) | |
| download | haskell-319703ee0c97c593be514222fdee06555816cda4.tar.gz | |
Don't re-export `Alternative(..)` from Control.Monad (re #9586)
This was done in d94de87252d0fe2ae97341d186b03a2fbe136b04 to avoid orphans
but since a94dc4c3067c6a0925e2e39f35ef0930771535f1 moved `Alternative`
into GHC.Base, this isn't needed anymore.
This is important, as otherwise this would require a non-neglectable amount
of `Control.Monad hiding ((<|>), empty)` imports in user code.
The Haddock submodule is updated as well
Test Plan: partial local ./validate --fast, let Harbormaster doublecheck it
Reviewed By: ekmett, austin
Differential Revision: https://phabricator.haskell.org/D248
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/InteractiveUI.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 0bcecd3449..3192d20857 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -63,7 +63,7 @@ import Util -- Haskell Libraries import System.Console.Haskeline as Haskeline -import Control.Monad as Monad hiding (empty) +import Control.Monad as Monad import Control.Applicative hiding (empty) import Control.Monad.Trans.Class |