Commit 319703ee authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺

Don't re-export `Alternative(..)` from Control.Monad (re #9586)

This was done in d94de872 to avoid orphans
but since a94dc4c3 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
parent c5f65c6d
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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}
......
......@@ -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
......
......@@ -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
......
......@@ -20,7 +20,6 @@ module Control.Monad
Functor(fmap)
, Monad((>>=), (>>), return, fail)
, Alternative(empty, (<|>), some, many)
, MonadPlus(mzero, mplus)
-- * Functions
......
......@@ -28,7 +28,8 @@
module T4524 where
import Data.Maybe ( mapMaybe )
import Control.Monad (Alternative(..), MonadPlus(..), msum, ap, liftM )
import Control.Applicative ( Alternative(..) )
import Control.Monad ( MonadPlus(..), msum, ap, liftM )
import Unsafe.Coerce (unsafeCoerce)
newtype FileName = FN FilePath deriving ( Eq, Ord )
......
......@@ -5,7 +5,7 @@
-- type signature in t1 and t2
module Foo7 where
import Control.Monad hiding (empty)
import Control.Monad
import Control.Monad.ST
import Data.Array.MArray
import Data.Array.ST
......
Subproject commit 12dc730e62236e15f1194ddc8260affc24928bd1
Subproject commit a65d2131647e010608d2a1956116a0012946838f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment