git.iko.soy/monoidal-containers
on master help sign in
Merge pull request #37 from 3noch/eac@fix-ci
8069571Ali Abrar
src/Data/HashMap/Monoidal.hs+3
@@ -66,6 +66,9 @@ newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap
66 , Foldable, Traversable, Data, Typeable, Hashable, Align
66 , Foldable, Traversable, Data, Typeable, Hashable, Align
67#if MIN_VERSION_unordered_containers(0,2,8)
67#if MIN_VERSION_unordered_containers(0,2,8)
68 , Hashable1
68 , Hashable1
69+#endif
70+#if MIN_VERSION_these(0,8,0)
71+ , Semialign
69#endif
72#endif
70 )
73 )
71
74
src/Data/Map/Monoidal.hs+8−4
@@ -154,10 +154,14 @@ import Data.Align
154
154
155-- | A 'Map' with monoidal accumulation
155-- | A 'Map' with monoidal accumulation
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
157− deriving (Show, Read, Functor, Eq, Ord, NFData,
157+ deriving ( Show, Read, Functor, Eq, Ord, NFData
158− Foldable, Traversable,
158+ , Foldable, Traversable
159− FromJSON, ToJSON, FromJSON1, ToJSON1,
159+ , FromJSON, ToJSON, FromJSON1, ToJSON1
160− Data, Typeable, Align)
160+ , Data, Typeable, Align
161+#if MIN_VERSION_these(0,8,0)
162+ , Semialign
163+#endif
164+ )
161
165
162#if MIN_VERSION_containers(0,5,9)
166#if MIN_VERSION_containers(0,5,9)
163deriving instance (Ord k) => Eq1 (MonoidalMap k)
167deriving instance (Ord k) => Eq1 (MonoidalMap k)
src/Data/Map/Monoidal/Strict.hs+8−4
@@ -154,10 +154,14 @@ import Data.Align
154
154
155-- | A 'Map' with monoidal accumulation
155-- | A 'Map' with monoidal accumulation
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
157− deriving (Show, Read, Functor, Eq, Ord, NFData,
157+ deriving ( Show, Read, Functor, Eq, Ord, NFData
158− Foldable, Traversable,
158+ , Foldable, Traversable
159− FromJSON, ToJSON, FromJSON1, ToJSON1,
159+ , FromJSON, ToJSON, FromJSON1, ToJSON1
160− Data, Typeable, Align)
160+ , Data, Typeable, Align
161+#if MIN_VERSION_these(0,8,0)
162+ , Semialign
163+#endif
164+ )
161
165
162#if MIN_VERSION_containers(0,5,9)
166#if MIN_VERSION_containers(0,5,9)
163deriving instance (Ord k) => Eq1 (MonoidalMap k)
167deriving instance (Ord k) => Eq1 (MonoidalMap k)