git.iko.soy/reflex
on develop help sign in
Revert "Fix merges (#340)"

This reverts commit eeeae5f39b76d2779555fcf48e1868c9b12dc205.

commitc5e2ecd9467d03a56660f1ff2384a4db1ec4517b authorMatthew Bauer <mjbauer95@gmail.com> dateFri 31 Jan 2020, 16:22 (7 years ago) parent7e7afe1
3 files changed+3−12
compare with develop
unifiedsplit
ChangeLog.md+2−9 default.nix−1 src/Reflex/Pure.hs+1−2
ChangeLog.md+2−9
@@ -17,21 +17,14 @@
1717## 0.6.2.1
1818
1919* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
20− functor:
21− * `fan` to `fanG`
22− * `EventSelectorG` for `fanG` result selector.
23−
24−* Reduce the amount of unsafeCoerce in coercing newtypes under Event/Dynamic/Behavior.
25− * Add fused ReaderIO for the purpose of coercion (ReaderT's third argument has nominal role preventing automated coerce)
26− * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
20+ values.
2721
2822* Generalize merging functions:
2923 `merge` to `mergeG`,
3024 `mergeIncremental` to `mergeIncrementalG`,
25+ `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
3126 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
3227
33−* Generalize distribute function:
34− `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
3528
3629## 0.6.2.0
3730
default.nix−1
@@ -23,7 +23,6 @@ mkDerivation {
2323 base bifunctors containers deepseq dependent-map dependent-sum
2424 mtl ref-tf split transformers data-default
2525 random time unbounded-delays monoidal-containers witherable
26− profunctors
2726 ] ++ (if ghc.isGhcjs or false then [
2827 ghcjs-base
2928 ] else []) ++ (if !useTemplateHaskell then [] else [
src/Reflex/Pure.hs+1−2
@@ -88,8 +88,7 @@ instance (Enum t, HasTrie t, Ord t) => Reflex (Pure t) where
8888 then Nothing
8989 else Just currentOccurrences
9090
91−-- The instance signature doeesn't compile, leave commented for documentation
92−-- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
91+ -- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
9392 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
9493
9594 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a