summaryrefslogtreecommitdiff
path: root/compiler/utils/IOEnv.hs
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-09-26 21:09:56 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-09-26 21:12:01 +0200
commit319703ee0c97c593be514222fdee06555816cda4 (patch)
tree72052ffc9f58ad7809c636d6e6a4a28207fa7718 /compiler/utils/IOEnv.hs
parentc5f65c6dadd3f6f3e1ba8a7d0cec25ede1561339 (diff)
downloadhaskell-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/utils/IOEnv.hs')
-rw-r--r--compiler/utils/IOEnv.hs2
1 files changed, 0 insertions, 2 deletions
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