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 /compiler | |
| 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 'compiler')
| -rw-r--r-- | compiler/main/ErrUtils.lhs | 4 | ||||
| -rw-r--r-- | compiler/parser/RdrHsSyn.lhs | 4 | ||||
| -rw-r--r-- | compiler/prelude/PrelRules.lhs | 4 | ||||
| -rw-r--r-- | compiler/typecheck/TcRnDriver.lhs | 4 | ||||
| -rw-r--r-- | compiler/utils/IOEnv.hs | 2 |
5 files changed, 3 insertions, 15 deletions
diff --git a/compiler/main/ErrUtils.lhs b/compiler/main/ErrUtils.lhs index b06f5bcb9c..c43064e7f1 100644 --- a/compiler/main/ErrUtils.lhs +++ b/compiler/main/ErrUtils.lhs @@ -55,11 +55,7 @@ import qualified Data.Set as Set import Data.IORef import Data.Ord import Data.Time -#if __GLASGOW_HASKELL__ >= 709 -import Control.Monad hiding (empty) -#else import Control.Monad -#endif import Control.Monad.IO.Class import System.IO diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs index 6bd5d27b1a..e6969e7422 100644 --- a/compiler/parser/RdrHsSyn.lhs +++ b/compiler/parser/RdrHsSyn.lhs @@ -86,11 +86,7 @@ import Maybes import Util import Control.Applicative ((<$>)) -#if __GLASGOW_HASKELL__ >= 709 -import Control.Monad hiding (empty, many) -#else import Control.Monad -#endif import Text.ParserCombinators.ReadP as ReadP import Data.Char diff --git a/compiler/prelude/PrelRules.lhs b/compiler/prelude/PrelRules.lhs index a91d3f7d9e..1e5f2593a1 100644 --- a/compiler/prelude/PrelRules.lhs +++ b/compiler/prelude/PrelRules.lhs @@ -48,7 +48,9 @@ import Platform import Util import Coercion (mkUnbranchedAxInstCo,mkSymCo,Role(..)) -#if __GLASGOW_HASKELL__ < 709 +#if __GLASGOW_HASKELL__ >= 709 +import Control.Applicative ( Alternative(..) ) +#else import Control.Applicative ( Applicative(..), Alternative(..) ) #endif diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs index 49276848ff..9898b46066 100644 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs @@ -100,11 +100,7 @@ import Maybes import Util import Bag -#if __GLASGOW_HASKELL__ >= 709 -import Control.Monad hiding (empty) -#else import Control.Monad -#endif #include "HsVersions.h" \end{code} diff --git a/compiler/utils/IOEnv.hs b/compiler/utils/IOEnv.hs index 8193beb87f..46f6e467c1 100644 --- a/compiler/utils/IOEnv.hs +++ b/compiler/utils/IOEnv.hs @@ -44,9 +44,7 @@ import System.IO.Unsafe ( unsafeInterleaveIO ) import System.IO ( fixIO ) import Control.Monad import MonadUtils -#if __GLASGOW_HASKELL__ < 709 import Control.Applicative (Alternative(..)) -#endif ---------------------------------------------------------------------- -- Defining the monad type |