typeable/validationt
1
0
Fork 0
mirror of https://github.com/typeable/validationt.git synced 2024-11-22 01:34:05 +03:00
Code Issues Projects Releases Wiki Activity

Add Semigroup instance for ghc-8.4 only

Browse Source
This commit is contained in:
Dmitry Bushev 2018-04-23 10:55:34 +03:00
parent 2a7adf2bdc
commit 33541bfc18
No known key found for this signature in database
GPG Key ID: 87C16090D6910E91
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Control/Monad/Validation.hs
View File

@ -17,7 +17,6 @@ import Data.Foldable as F
import Data.List as L
import Data.Map.Strict as M
import Data.Monoid
import qualified Data.Semigroup as S
import Data.Text as T
import Data.Vector as V
import Test.QuickCheck
@ -50,7 +49,7 @@ instance (Ord k) => At (MonoidMap k v) where
at key = _MonoidMap . at key
#if MIN_VERSION_base(4,11,0)
instance (Ord k, S.Semigroup v) => S.Semigroup (MonoidMap k v) where
instance (Ord k, Semigroup v) => Semigroup (MonoidMap k v) where
(<>) = mmAppend
#endif
@ -77,12 +76,11 @@ instance (Ord k, FromJSON k, FromJSON v) => FromJSON (MonoidMap k v) where
return (key, val)
#if MIN_VERSION_base(4,11,0)
mmAppend :: (Ord k, S.Semigroup v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v
mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (S.<>) a b
mmAppend :: (Ord k, Semigroup v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v
#else
mmAppend :: (Ord k, Monoid v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v
mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (<>) a b
#endif
mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (<>) a b
-- | Convenient for 'vZoom' as first artument. Will prevent generation
-- of map with 'mempty' values

2
validationt.cabal
View File

@ -39,7 +39,5 @@ library
, transformers-base
, transformers-lift
, vector
if impl(ghc < 8.0)
build-depends: semigroups == 0.18.*
hs-source-dirs: src
default-language: Haskell2010