[commit: packages/containers] ghc-head: Modify imports so that Alternative can be used unqualified. (e156c33)

git at git.haskell.org git at git.haskell.org
Fri Aug 30 13:34:31 CEST 2013


Repository : ssh://git@git.haskell.org/containers

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/containers.git;a=commit;h=e156c33bcec792785354de422d21c44344daa3ed

>---------------------------------------------------------------

commit e156c33bcec792785354de422d21c44344daa3ed
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Nov 14 21:50:05 2012 +0100

    Modify imports so that Alternative can be used unqualified.


>---------------------------------------------------------------

e156c33bcec792785354de422d21c44344daa3ed
 Data/Sequence.hs |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index bd60ea4..a11dec1 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -142,9 +142,9 @@ import Prelude hiding (
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
     takeWhile, dropWhile, iterate, reverse, filter, mapM, sum, all)
 import qualified Data.List
-import Control.Applicative (Applicative(..), (<$>), WrappedMonad(..), liftA,
-                            liftA2, liftA3)
-import qualified Control.Applicative as Applicative
+import Control.Applicative (Applicative(..), (<$>), Alternative,
+                            WrappedMonad(..), liftA, liftA2, liftA3)
+import qualified Control.Applicative as Applicative (Alternative(..))
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
@@ -208,7 +208,7 @@ instance MonadPlus Seq where
     mzero = empty
     mplus = (><)
 
-instance Applicative.Alternative Seq where
+instance Alternative Seq where
     empty = empty
     (<|>) = (><)
 





More information about the ghc-commits mailing list