git.iko.soy/patch
on develop help sign in
Merge remote-tracking branch 'origin/develop' into query
7c40d65Luigy Leon
src/Reflex/Requester/Base.hs+6−1
compare with develop
unifiedsplit
@@ -45,7 +45,12 @@ import Data.Some (Some)
45
45
46-- | A basic implementation of 'Requester'.
46-- | A basic implementation of 'Requester'.
47newtype RequesterT t request response m a = RequesterT { unRequesterT :: EventWriterT t (DMap (Tag (PrimState m)) request) (ReaderT (EventSelector t (WrapArg response (Tag (PrimState m)))) m) a }
47newtype RequesterT t request response m a = RequesterT { unRequesterT :: EventWriterT t (DMap (Tag (PrimState m)) request) (ReaderT (EventSelector t (WrapArg response (Tag (PrimState m)))) m) a }
48− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)
48+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
49+-- MonadAsyncException can't be derived on ghc-8.0.1; we use base-4.9.1 as a proxy for ghc-8.0.2
50+#if MIN_VERSION_base(4,9,1)
51+ , MonadAsyncException
52+#endif
53+ )
49
54
50deriving instance MonadSample t m => MonadSample t (RequesterT t request response m)
55deriving instance MonadSample t m => MonadSample t (RequesterT t request response m)
51deriving instance MonadHold t m => MonadHold t (RequesterT t request response m)
56deriving instance MonadHold t m => MonadHold t (RequesterT t request response m)
src/Reflex/Spider/Internal.hs+2
@@ -1639,6 +1639,8 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.siz
1639 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1639 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a
1640 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1640 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of
1641 Nothing -> do
1641 Nothing -> do
1642+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent
1643+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight
1642 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1644 return $ Just $ _mergeSubscribedParentWithMove_subscription parent
1643 Just toKey -> do
1645 Just toKey -> do
1644 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey
1646 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey