summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConalElliott <>2016-01-15 03:40:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-01-15 03:40:00 (GMT)
commit0ae453c01c65fc7cb7d7533ab4596f456d01fb51 (patch)
tree51ab3c49fd5d9b51269e0dfd840010a3d9d9a2ca
parentb82ff7a2edefc1bd0a9b99f0db2373aba148aa56 (diff)
version 0.9.110.9.11
-rw-r--r--TypeCompose.cabal10
-rw-r--r--src/Control/Compose.hs8
-rw-r--r--src/Control/Instances.hs18
3 files changed, 11 insertions, 25 deletions
diff --git a/TypeCompose.cabal b/TypeCompose.cabal
index 6cc93c5..cea3f1a 100644
--- a/TypeCompose.cabal
+++ b/TypeCompose.cabal
@@ -1,5 +1,5 @@
Name: TypeCompose
-Version: 0.9.10
+Version: 0.9.11
Synopsis: Type composition classes & instances
Category: Composition, Control
Cabal-Version: >= 1.6
@@ -10,7 +10,7 @@ Description:
Please see the project wiki page: <http://haskell.org/haskellwiki/TypeCompose>
.
Copyright 2007-2012 by Conal Elliott; BSD3 license.
-Author: Conal Elliott
+Author: Conal Elliott
Maintainer: conal@conal.net
Homepage: https://github.com/conal/TypeCompose
Copyright: (c) 2007-2013 by Conal Elliott
@@ -25,8 +25,8 @@ source-repository head
Library
Hs-Source-Dirs: src
- Build-Depends: base<5
- Exposed-Modules:
+ Build-Depends: base<5, base-orphans >= 0.5
+ Exposed-Modules:
Data.Bijection
Data.CxMonoid
Data.RefMonad
@@ -41,4 +41,4 @@ Library
-- TODO: eliminate Pair or Zip
--- ghc-prof-options: -prof -auto-all
+-- ghc-prof-options: -prof -auto-all
diff --git a/src/Control/Compose.hs b/src/Control/Compose.hs
index 5484f16..41941ea 100644
--- a/src/Control/Compose.hs
+++ b/src/Control/Compose.hs
@@ -6,8 +6,6 @@
-- For ghc 6.6 compatibility
-- {-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-}
-{-# OPTIONS_GHC -Wall -fno-warn-orphans #-}
-
----------------------------------------------------------------------
-- |
-- Module : Control.Compose
@@ -76,6 +74,7 @@ import Control.Arrow
hiding (pure)
#endif
+import Data.Orphans ()
import Data.Monoid
import Data.Foldable
import Data.Traversable
@@ -904,12 +903,7 @@ inConst3 f (Const a) = inConst2 (f a)
---- For Control.Applicative.Endo
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 707
-- deriving instance Monoid o => Monoid (Const o a)
-instance Monoid o => Monoid (Const o a) where
- mempty = Const mempty
- mappend = inConst2 mappend
-#endif
-- newtype Endo a = Endo { appEndo :: a -> a }
diff --git a/src/Control/Instances.hs b/src/Control/Instances.hs
index 55db8de..f42b5be 100644
--- a/src/Control/Instances.hs
+++ b/src/Control/Instances.hs
@@ -1,28 +1,20 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
----------------------------------------------------------------------
-- |
-- Module : Control.Instances
-- Copyright : (c) Conal Elliott 2007
-- License : BSD3
---
+--
-- Maintainer : conal@conal.net
-- Stability : experimental
-- Portability : portable
---
+--
-- Some (orphan) instances that belong elsewhere (where they wouldn't be orphans).
-- Add the following line to get these instances
---
+--
-- > import Control.Instances ()
---
+--
----------------------------------------------------------------------
module Control.Instances () where
-import Data.Monoid
-import Control.Applicative
-
-
--- Standard instance: Applicative functor applied to monoid
-instance Monoid o => Monoid (IO o) where
- mempty = pure mempty
- mappend = liftA2 mappend
+import Data.Orphans ()