From d94de87252d0fe2ae97341d186b03a2fbe136b04 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 22 Apr 2014 06:09:40 -0500 Subject: Make Applicative a superclass of Monad Summary: This includes pretty much all the changes needed to make `Applicative` a superclass of `Monad` finally. There's mostly reshuffling in the interests of avoid orphans and boot files, but luckily we can resolve all of them, pretty much. The only catch was that Alternative/MonadPlus also had to go into Prelude to avoid this. As a result, we must update the hsc2hs and haddock submodules. Signed-off-by: Austin Seipp Test Plan: Build things, they might not explode horribly. Reviewers: hvr, simonmar Subscribers: simonmar Differential Revision: https://phabricator.haskell.org/D13 --- utils/ghc-pkg/Main.hs | 2 ++ utils/haddock | 2 +- utils/hsc2hs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index ac958da73e..45c6e8b9c4 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -42,7 +42,9 @@ import qualified Data.Set as Set import Data.Char ( isSpace, toLower ) import Data.Ord (comparing) +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative (Applicative(..)) +#endif import Control.Monad import System.Directory ( doesDirectoryExist, getDirectoryContents, doesFileExist, renameFile, removeFile, diff --git a/utils/haddock b/utils/haddock index aacaa91951..0cc5bc85e9 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit aacaa91951b16f22e3ad54412974b81c32230a8c +Subproject commit 0cc5bc85e9fca92ab712b68a2ba2c0dd9d3d79f4 diff --git a/utils/hsc2hs b/utils/hsc2hs index 4a0f67704d..af92e43936 160000 --- a/utils/hsc2hs +++ b/utils/hsc2hs @@ -1 +1 @@ -Subproject commit 4a0f67704d89712f8493a0c7eccffa9243d6ef09 +Subproject commit af92e439369b7a3bb7d0476243af9b5622b7a48f -- cgit v1.2.1