Fix for 8.4.2

Author: Ryan Trinkle

reflex.cabal

@@ -52,7 +52,7 @@ library
   hs-source-dirs: src
   build-depends:
     MemoTrie == 0.6.*,
-    base >= 4.7 && < 4.11,
+    base >= 4.7 && < 4.12,
     bifunctors >= 5.2 && < 5.6,
     comonad,
     containers == 0.5.*,
@@ -147,7 +147,7 @@ library
       dependent-sum >= 0.3 && < 0.5,
       haskell-src-exts >= 1.16 && < 1.21,
       haskell-src-meta >= 0.6 && < 0.9,
-      template-haskell >= 2.9 && < 2.13
+      template-haskell >= 2.9 && < 2.14
     exposed-modules:
       Reflex.Dynamic.TH
     other-extensions: TemplateHaskell

src/Reflex/Profiled.hs

@@ -23,8 +23,9 @@ import Data.FastMutableIntMap
 import Data.IORef
 import Data.Map (Map)
 import qualified Data.Map.Strict as Map
-import Data.Monoid
+import Data.Monoid ((<>))
 import Data.Ord
+import qualified Data.Semigroup as S
 import Data.Type.Coercion
 import Foreign.Ptr
 import GHC.Foreign
@@ -50,9 +51,13 @@ data CostCentreTree = CostCentreTree
   }
   deriving (Show, Eq, Ord)
 
+instance S.Semigroup CostCentreTree where
+  (CostCentreTree oa ea ca) <> (CostCentreTree ob eb cb) =
+      CostCentreTree (oa + ob) (ea + eb) $ Map.unionWith (S.<>) ca cb
+
 instance Monoid CostCentreTree where
   mempty = CostCentreTree 0 0 mempty
-  CostCentreTree oa ea ca `mappend` CostCentreTree ob eb cb = CostCentreTree (oa + ob) (ea + eb) $ Map.unionWith (<>) ca cb
+  mappend = (S.<>)
 
 getCostCentreStack :: Ptr CostCentreStack -> IO [Ptr CostCentre]
 getCostCentreStack = go []

src/Reflex/Query/Base.hs

@@ -30,7 +30,7 @@ import Data.Functor.Compose
 import Data.Functor.Misc
 import Data.Map (Map)
 import qualified Data.Map as Map
-import Data.Monoid
+import Data.Monoid ((<>))
 import qualified Data.Semigroup as S
 import Data.Some (Some)
 import qualified Data.Some as Some
@@ -216,7 +216,7 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (QueryT t q
 -- TODO: Monoid and Semigroup can likely be derived once StateT has them.
 instance (Monoid a, Monad m) => Monoid (QueryT t q m a) where
   mempty = pure mempty
-  mappend = liftA2 mappend
+  mappend = (<>)
 
 instance (S.Semigroup a, Monad m) => S.Semigroup (QueryT t q m a) where
   (<>) = liftA2 (S.<>)

src/Reflex/TriggerEvent/Base.hs

@@ -22,6 +22,7 @@ import Control.Monad.Ref
 import Data.Coerce
 import Data.Dependent.Sum
 import Data.IORef
+import Data.Monoid ((<>))
 import qualified Data.Semigroup as S
 import Reflex.Class
 import Reflex.Host.Class
@@ -134,7 +135,7 @@ instance Adjustable t m => Adjustable t (TriggerEventT t m) where
 -- TODO: Monoid and Semigroup can likely be derived once ReaderT has them.
 instance (Monoid a, Applicative m) => Monoid (TriggerEventT t m a) where
   mempty = pure mempty
-  mappend = liftA2 mappend
+  mappend = (<>)
 
 instance (S.Semigroup a, Applicative m) => S.Semigroup (TriggerEventT t m a) where
   (<>) = liftA2 (S.<>)