@@ -38,14 +38,11 @@ import Data.Foldable as F
38import Data.Functor
38import Data.Functor
39import Data.List as L
39import Data.List as L
40import Data.Map.Strict as M
40import Data.Map.Strict as M
41import Data.Text as T
42import Data.Text as T
42import Data.Vector as V
43import Data.Vector as V
43import Test.QuickCheck
44import Test.QuickCheck
45−#if MIN_VERSION_mtl(2,3,0)
47−import Control.Monad.Fix
50-- | Collects all thrown warnings in 'StateT' and errors
47-- | Collects all thrown warnings in 'StateT' and errors
51-- in 'ExceptT' into a single value using 'Monoid'.
48-- in 'ExceptT' into a single value using 'Monoid'.
@@ -89,7 +86,7 @@ instance (Ord k, Semigroup v) => Semigroup (MonoidMap k v) where
90instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
87instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
91 mempty = MonoidMap M.empty
88 mempty = MonoidMap M.empty
92− mappend = (<>)
89+ mappend = mmAppend
94instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
91instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
95 toJSON (MonoidMap m) = toJSON $ L.map toObj $ M.toList m
92 toJSON (MonoidMap m) = toJSON $ L.map toObj $ M.toList m