git.iko.soy/reflex
on develop help sign in
Fix for 8.4.2
commit5d9c8a00f2eb832f109c870963182149b988062a authorRyan Trinkle <ryan.trinkle@gmail.com> dateWed 16 May 2018, 20:09 (8 years ago) parente549ebb
4 files changed+13−7
compare with develop
unifiedsplit
reflex.cabal+2−2 src/Reflex/Profiled.hs+7−2 src/Reflex/Query/Base.hs+2−2 src/Reflex/TriggerEvent/Base.hs+2−1
reflex.cabal+2−2
@@ -52,7 +52,7 @@ library
5252 hs-source-dirs: src
5353 build-depends:
5454 MemoTrie == 0.6.*,
55− base >= 4.7 && < 4.11,
55+ base >= 4.7 && < 4.12,
5656 bifunctors >= 5.2 && < 5.6,
5757 comonad,
5858 containers == 0.5.*,
@@ -147,7 +147,7 @@ library
147147 dependent-sum >= 0.3 && < 0.5,
148148 haskell-src-exts >= 1.16 && < 1.21,
149149 haskell-src-meta >= 0.6 && < 0.9,
150− template-haskell >= 2.9 && < 2.13
150+ template-haskell >= 2.9 && < 2.14
151151 exposed-modules:
152152 Reflex.Dynamic.TH
153153 other-extensions: TemplateHaskell
src/Reflex/Profiled.hs+7−2
@@ -23,8 +23,9 @@ import Data.FastMutableIntMap
2323import Data.IORef
2424import Data.Map (Map)
2525import qualified Data.Map.Strict as Map
26−import Data.Monoid
26+import Data.Monoid ((<>))
2727import Data.Ord
28+import qualified Data.Semigroup as S
2829import Data.Type.Coercion
2930import Foreign.Ptr
3031import GHC.Foreign
@@ -50,9 +51,13 @@ data CostCentreTree = CostCentreTree
5051 }
5152 deriving (Show, Eq, Ord)
5253
54+instance S.Semigroup CostCentreTree where
55+ (CostCentreTree oa ea ca) <> (CostCentreTree ob eb cb) =
56+ CostCentreTree (oa + ob) (ea + eb) $ Map.unionWith (S.<>) ca cb
57+
5358instance Monoid CostCentreTree where
5459 mempty = CostCentreTree 0 0 mempty
55− CostCentreTree oa ea ca `mappend` CostCentreTree ob eb cb = CostCentreTree (oa + ob) (ea + eb) $ Map.unionWith (<>) ca cb
60+ mappend = (S.<>)
5661
5762getCostCentreStack :: Ptr CostCentreStack -> IO [Ptr CostCentre]
5863getCostCentreStack = go []
src/Reflex/Query/Base.hs+2−2
@@ -30,7 +30,7 @@ import Data.Functor.Compose
3030import Data.Functor.Misc
3131import Data.Map (Map)
3232import qualified Data.Map as Map
33−import Data.Monoid
33+import Data.Monoid ((<>))
3434import qualified Data.Semigroup as S
3535import Data.Some (Some)
3636import qualified Data.Some as Some
@@ -216,7 +216,7 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (QueryT t q
216216-- TODO: Monoid and Semigroup can likely be derived once StateT has them.
217217instance (Monoid a, Monad m) => Monoid (QueryT t q m a) where
218218 mempty = pure mempty
219− mappend = liftA2 mappend
219+ mappend = (<>)
220220
221221instance (S.Semigroup a, Monad m) => S.Semigroup (QueryT t q m a) where
222222 (<>) = liftA2 (S.<>)
src/Reflex/TriggerEvent/Base.hs+2−1
@@ -22,6 +22,7 @@ import Control.Monad.Ref
2222import Data.Coerce
2323import Data.Dependent.Sum
2424import Data.IORef
25+import Data.Monoid ((<>))
2526import qualified Data.Semigroup as S
2627import Reflex.Class
2728import Reflex.Host.Class
@@ -134,7 +135,7 @@ instance Adjustable t m => Adjustable t (TriggerEventT t m) where
134135-- TODO: Monoid and Semigroup can likely be derived once ReaderT has them.
135136instance (Monoid a, Applicative m) => Monoid (TriggerEventT t m a) where
136137 mempty = pure mempty
137− mappend = liftA2 mappend
138+ mappend = (<>)
138139
139140instance (S.Semigroup a, Applicative m) => S.Semigroup (TriggerEventT t m a) where
140141 (<>) = liftA2 (S.<>)