5d9c8a0 · patch · git.iko.soy

reflex.cabal+2−2

compare with develop

unifiedsplit

@@ -52,7 +52,7 @@ library

52 hs-source-dirs: src

53 build-depends:

54 MemoTrie == 0.6.*,

55− base >= 4.7 && < 4.11,

55+ base >= 4.7 && < 4.12,

56 bifunctors >= 5.2 && < 5.6,

57 comonad,

58 containers == 0.5.*,

@@ -147,7 +147,7 @@ library

147 dependent-sum >= 0.3 && < 0.5,

148 haskell-src-exts >= 1.16 && < 1.21,

149 haskell-src-meta >= 0.6 && < 0.9,

150− template-haskell >= 2.9 && < 2.13

150+ template-haskell >= 2.9 && < 2.14

151 exposed-modules:

152 Reflex.Dynamic.TH

153 other-extensions: TemplateHaskell

src/Reflex/Profiled.hs+7−2

@@ -23,8 +23,9 @@ import Data.FastMutableIntMap

23import Data.IORef

24import Data.Map (Map)

25import qualified Data.Map.Strict as Map

26−import Data.Monoid

26+import Data.Monoid ((<>))

27import Data.Ord

28+import qualified Data.Semigroup as S

28import Data.Type.Coercion

29import Data.Type.Coercion

29import Foreign.Ptr

30import Foreign.Ptr

30import GHC.Foreign

31import GHC.Foreign

@@ -50,9 +51,13 @@ data CostCentreTree = CostCentreTree

50 }

51 }

51 deriving (Show, Eq, Ord)

52 deriving (Show, Eq, Ord)

52

53

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+

53instance Monoid CostCentreTree where

58instance Monoid CostCentreTree where

54 mempty = CostCentreTree 0 0 mempty

59 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.<>)

56

61

57getCostCentreStack :: Ptr CostCentreStack -> IO [Ptr CostCentre]

62getCostCentreStack :: Ptr CostCentreStack -> IO [Ptr CostCentre]

58getCostCentreStack = go []

63getCostCentreStack = go []

src/Reflex/Query/Base.hs+2−2

@@ -30,7 +30,7 @@ import Data.Functor.Compose

30import Data.Functor.Misc

31import Data.Map (Map)

32import qualified Data.Map as Map

33−import Data.Monoid

33+import Data.Monoid ((<>))

34import qualified Data.Semigroup as S

35import Data.Some (Some)

36import qualified Data.Some as Some

@@ -216,7 +216,7 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (QueryT t q

216-- TODO: Monoid and Semigroup can likely be derived once StateT has them.

217instance (Monoid a, Monad m) => Monoid (QueryT t q m a) where

218 mempty = pure mempty

219− mappend = liftA2 mappend

219+ mappend = (<>)

220

221instance (S.Semigroup a, Monad m) => S.Semigroup (QueryT t q m a) where

222 (<>) = liftA2 (S.<>)

src/Reflex/TriggerEvent/Base.hs+2−1

@@ -22,6 +22,7 @@ import Control.Monad.Ref

22import Data.Coerce

23import Data.Dependent.Sum

24import Data.IORef

25+import Data.Monoid ((<>))

25import qualified Data.Semigroup as S

26import qualified Data.Semigroup as S

26import Reflex.Class

27import Reflex.Class

27import Reflex.Host.Class

28import Reflex.Host.Class

@@ -134,7 +135,7 @@ instance Adjustable t m => Adjustable t (TriggerEventT t m) where

134-- TODO: Monoid and Semigroup can likely be derived once ReaderT has them.

135-- TODO: Monoid and Semigroup can likely be derived once ReaderT has them.

135instance (Monoid a, Applicative m) => Monoid (TriggerEventT t m a) where

136instance (Monoid a, Applicative m) => Monoid (TriggerEventT t m a) where

136 mempty = pure mempty

137 mempty = pure mempty

137− mappend = liftA2 mappend

138+ mappend = (<>)

138

139

139instance (S.Semigroup a, Applicative m) => S.Semigroup (TriggerEventT t m a) where

140instance (S.Semigroup a, Applicative m) => S.Semigroup (TriggerEventT t m a) where

140 (<>) = liftA2 (S.<>)

141 (<>) = liftA2 (S.<>)