@@ -38,11 +38,14 @@ import Data.Foldable as F
3838import Data.Functor
3939import Data.List as L
4040import Data.Map.Strict as M
41−import Data.Monoid
4241import Data.Text as T
4342import Data.Vector as V
4443import Test.QuickCheck
4544
45+#if MIN_VERSION_mtl(2,3,0)
46+import Control.Monad
47+import Control.Monad.Fix
48+#endif
4649
4750-- | Collects all thrown warnings in 'StateT' and errors
4851-- in 'ExceptT' into a single value using 'Monoid'.
@@ -86,7 +89,7 @@ instance (Ord k, Semigroup v) => Semigroup (MonoidMap k v) where
8689
8790instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
8891 mempty = MonoidMap M.empty
89− mappend = mmAppend
92+ mappend = (<>)
9093
9194instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
9295 toJSON (MonoidMap m) = toJSON $ L.map toObj $ M.toList m