TypeCompose 0.9.10 → 0.9.11

raw patch · 3 files changed

+11/−25 lines, 3 filesdep +base-orphansdep ~base

Dependencies added: base-orphans

Dependency ranges changed: base

Files

• TypeCompose.cabal +5/−5
• src/Control/Compose.hs +1/−7
• src/Control/Instances.hs +5/−13

@@ -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 @@   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 @@  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 @@    -- TODO: eliminate Pair or Zip ---  ghc-prof-options:    -prof -auto-all +--  ghc-prof-options:    -prof -auto-all

@@ -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 @@                       hiding (pure) #endif +import Data.Orphans () import Data.Monoid import Data.Foldable import Data.Traversable@@ -904,12 +903,7 @@  ---- 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 } 

@@ -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 ()