git.iko.soy/patch
on develop help sign in
Fix 7.10 build.
3a7b4c1Luigy Leon
src/Data/Functor/Misc.hs+6−1
compare with develop
unifiedsplit
@@ -291,7 +291,12 @@ dsumToEither = \case
291-- | We can't use @Compose Maybe@ instead of 'ComposeMaybe', because that would
291-- | We can't use @Compose Maybe@ instead of 'ComposeMaybe', because that would
292-- make the 'f' parameter have a nominal type role. We need f to be
292-- make the 'f' parameter have a nominal type role. We need f to be
293-- representational so that we can use safe 'coerce'.
293-- representational so that we can use safe 'coerce'.
294+#if MIN_VERSION_transformers(5,2,0)
295+newtype ComposeMaybe f a =
296+#else
297+newtype ComposeMaybe (f :: * -> *) (a :: *) =
298+#endif
294−newtype ComposeMaybe f a = ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)
299+ ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)
295
300
296deriving instance Functor f => Functor (ComposeMaybe f)
301deriving instance Functor f => Functor (ComposeMaybe f)
297
302
src/Reflex/EventWriter.hs+2−2
@@ -77,7 +77,7 @@ instance MonadHold t m => MonadHold t (EventWriterT t w m) where
77 holdDyn v0 = lift . holdDyn v0
77 holdDyn v0 = lift . holdDyn v0
78 holdIncremental v0 = lift . holdIncremental v0
78 holdIncremental v0 = lift . holdIncremental v0
79
79
80−instance (Reflex t, MonadAdjust t m, MonadHold t m, Semigroup w, Semigroup w) => MonadAdjust t (EventWriterT t w m) where
80+instance (Reflex t, MonadAdjust t m, MonadHold t m, Semigroup w) => MonadAdjust t (EventWriterT t w m) where
81 runWithReplace = runWithReplaceEventWriterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'
81 runWithReplace = runWithReplaceEventWriterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'
82 traverseDMapWithKeyWithAdjust = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjust f dm0 dm') mapPatchDMap weakenPatchDMapWith patchMapNewElements mergeMapIncremental
82 traverseDMapWithKeyWithAdjust = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjust f dm0 dm') mapPatchDMap weakenPatchDMapWith patchMapNewElements mergeMapIncremental
83 traverseDMapWithKeyWithAdjustWithMove = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjustWithMove f dm0 dm') mapPatchDMapWithMove weakenPatchDMapWithMoveWith patchMapWithMoveNewElements mergeMapIncrementalWithMove
83 traverseDMapWithKeyWithAdjustWithMove = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjustWithMove f dm0 dm') mapPatchDMapWithMove weakenPatchDMapWithMoveWith patchMapWithMoveNewElements mergeMapIncrementalWithMove
@@ -108,7 +108,7 @@ runWithReplaceEventWriterTWith f a0 a' = do
108 return (fst result0, fmapCheap fst result')
108 return (fst result0, fmapCheap fst result')
109
109
110-- | Like 'runWithReplaceEventWriterTWith', but for 'sequenceDMapWithAdjust'.
110-- | Like 'runWithReplaceEventWriterTWith', but for 'sequenceDMapWithAdjust'.
111−sequenceDMapWithAdjustEventWriterTWith :: forall t m p p' w k v v'. (Reflex t, MonadHold t m, Semigroup w, Semigroup w, Patch (p' (Some k) (Event t w)), PatchTarget (p' (Some k) (Event t w)) ~ Map (Some k) (Event t w))
111+sequenceDMapWithAdjustEventWriterTWith :: forall t m p p' w k v v'. (Reflex t, MonadHold t m, Semigroup w, Patch (p' (Some k) (Event t w)), PatchTarget (p' (Some k) (Event t w)) ~ Map (Some k) (Event t w))
112 => ( (forall a. k a -> v a -> m (Compose ((,) (Seq (Event t w))) v' a))
112 => ( (forall a. k a -> v a -> m (Compose ((,) (Seq (Event t w))) v' a))
113 -> DMap k v
113 -> DMap k v
114 -> Event t (p k v)
114 -> Event t (p k v)