git.iko.soy/reflex
on develop help sign in
Bump version bound for dependent-map
commitdc3bf44d822d70594e3c474fe3869261776c3554 authorMalte Brandy <malte.brandy@maralorn.de> dateFri 19 Jun 2020, 13:33 (6 years ago) parentcf4ddc0
10 files changed+21−12
compare with develop
unifiedsplit
reflex.cabal+1−1 src/Reflex/Adjustable/Class.hs+2−1 src/Reflex/Class.hs+2−1 src/Reflex/EventWriter/Base.hs+2−1 src/Reflex/Profiled.hs+2−1 src/Reflex/Pure.hs+2−1 src/Reflex/Query/Base.hs+5−3 src/Reflex/Requester/Base.hs+2−1 src/Reflex/Spider/Internal.hs+2−1 test/Reflex/Test/CrossImpl.hs+1−1
reflex.cabal+1−1
@@ -77,7 +77,7 @@ library
7777 constraints-extras >= 0.3 && < 0.4,
7878 containers >= 0.6 && < 0.7,
7979 data-default >= 0.5 && < 0.8,
80− dependent-map >= 0.3 && < 0.4,
80+ dependent-map >= 0.3 && < 0.5,
8181 exception-transformers == 0.4.*,
8282 lens >= 4.7 && < 5,
8383 monad-control >= 1.0.1 && < 1.1,
src/Reflex/Adjustable/Class.hs+2−1
@@ -30,7 +30,8 @@ module Reflex.Adjustable.Class
3030
3131import Control.Monad.Identity
3232import Control.Monad.Reader
33−import Data.Dependent.Map (DMap, GCompare (..))
33+import Data.Dependent.Map (DMap)
34+import Data.GADT.Compare (GCompare(..))
3435import qualified Data.Dependent.Map as DMap
3536import Data.Functor.Constant
3637import Data.Functor.Misc
src/Reflex/Class.hs+2−1
@@ -196,7 +196,8 @@ import Data.Align
196196import Data.Bifunctor
197197import Data.Coerce
198198import Data.Default
199−import Data.Dependent.Map (DMap, DSum (..))
199+import Data.Dependent.Map (DMap)
200+import Data.Dependent.Sum (DSum (..))
200201import qualified Data.Dependent.Map as DMap
201202import Data.Functor.Compose
202203import Data.Functor.Product
src/Reflex/EventWriter/Base.hs+2−1
@@ -39,8 +39,9 @@ import Control.Monad.Primitive
3939import Control.Monad.Reader
4040import Control.Monad.Ref
4141import Control.Monad.State.Strict
42−import Data.Dependent.Map (DMap, DSum (..))
42+import Data.Dependent.Map (DMap)
4343import qualified Data.Dependent.Map as DMap
44+import Data.Dependent.Sum (DSum (..))
4445import Data.Functor.Compose
4546import Data.Functor.Misc
4647import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))
src/Reflex/Profiled.hs+2−1
@@ -28,7 +28,8 @@ import Control.Monad.Ref
2828import Control.Monad.State.Strict (StateT, execStateT, modify)
2929import Data.Bifunctor
3030import Data.Coerce
31−import Data.Dependent.Map (DMap, GCompare)
31+import Data.Dependent.Map (DMap)
32+import Data.GADT.Compare (GCompare)
3233import Data.FastMutableIntMap
3334import Data.IORef
3435import Data.List
src/Reflex/Pure.hs+2−1
@@ -32,7 +32,8 @@ module Reflex.Pure
3232 ) where
3333
3434import Control.Monad
35−import Data.Dependent.Map (DMap, GCompare)
35+import Data.Dependent.Map (DMap)
36+import Data.GADT.Compare (GCompare)
3637import qualified Data.Dependent.Map as DMap
3738import Data.IntMap (IntMap)
3839import qualified Data.IntMap as IntMap
src/Reflex/Query/Base.hs+5−3
@@ -27,11 +27,13 @@ import Control.Monad.Reader
2727import Control.Monad.Ref
2828import Control.Monad.State.Strict
2929import Data.Align
30−import Data.Dependent.Map (DMap, DSum (..))
30+import Data.Dependent.Map (DMap)
3131import qualified Data.Dependent.Map as DMap
32+import Data.Dependent.Sum (DSum(..))
3233import Data.Foldable
3334import Data.Functor.Compose
3435import Data.Functor.Misc
36+import Data.GADT.Compare (GCompare)
3537import Data.IntMap (IntMap)
3638import qualified Data.IntMap as IntMap
3739import Data.Map (Map)
@@ -135,7 +137,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t
135137 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
136138 return (liftedResult0, liftedResult')
137139
138− traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))
140+ traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))
139141 traverseDMapWithKeyWithAdjust f dm0 dm' = do
140142 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
141143 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
@@ -180,7 +182,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t
180182 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
181183 return (liftedResult0, liftedResult')
182184
183− traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))
185+ traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))
184186 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = do
185187 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
186188 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
src/Reflex/Requester/Base.hs+2−1
@@ -55,8 +55,9 @@ import Control.Monad.Ref
5555import Control.Monad.State.Strict
5656import Data.Bits
5757import Data.Coerce
58−import Data.Dependent.Map (DMap, DSum (..))
58+import Data.Dependent.Map (DMap)
5959import qualified Data.Dependent.Map as DMap
60+import Data.Dependent.Sum (DSum (..))
6061import Data.Functor.Compose
6162import Data.Functor.Misc
6263import Data.IntMap.Strict (IntMap)
src/Reflex/Spider/Internal.hs+2−1
@@ -46,8 +46,9 @@ import Control.Monad.Fail (MonadFail)
4646import qualified Control.Monad.Fail as MonadFail
4747import Data.Align
4848import Data.Coerce
49−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
5050import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
5152import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
5253import qualified Data.FastMutableIntMap as FastMutableIntMap
5354import Data.Foldable hiding (concat, elem, sequence_)
test/Reflex/Test/CrossImpl.hs+1−1
@@ -26,7 +26,7 @@ import qualified Reflex.Profiled as Prof
2626import Control.Arrow (second, (&&&))
2727import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
2828import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
29−import Data.Dependent.Map (DSum (..))
29+import Data.Dependent.Sum (DSum (..))
3030import Data.Foldable
3131import Data.Map.Strict (Map)
3232import qualified Data.Map.Strict as Map