on develop help sign in
Revert "Fix merges (#340)"
c5e2ecdMatthew Bauer
ChangeLog.md+2−9
@@ -17,21 +17,14 @@
17## 0.6.2.1
17## 0.6.2.1
18
18
19* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
19* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
20− functor:
20+ values.
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
27
21
28* Generalize merging functions:
22* Generalize merging functions:
29 `merge` to `mergeG`,
23 `merge` to `mergeG`,
30 `mergeIncremental` to `mergeIncrementalG`,
24 `mergeIncremental` to `mergeIncrementalG`,
25+ `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
31 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
26 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
32
27
33−* Generalize distribute function:
34− `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
35
28
36## 0.6.2.0
29## 0.6.2.0
37
30
default.nix−1
@@ -23,7 +23,6 @@ mkDerivation {
23 base bifunctors containers deepseq dependent-map dependent-sum
23 base bifunctors containers deepseq dependent-map dependent-sum
24 mtl ref-tf split transformers data-default
24 mtl ref-tf split transformers data-default
25 random time unbounded-delays monoidal-containers witherable
25 random time unbounded-delays monoidal-containers witherable
26− profunctors
27 ] ++ (if ghc.isGhcjs or false then [
26 ] ++ (if ghc.isGhcjs or false then [
28 ghcjs-base
27 ghcjs-base
29 ] else []) ++ (if !useTemplateHaskell then [] else [
28 ] 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
88 then Nothing
88 then Nothing
89 else Just currentOccurrences
89 else Just currentOccurrences
90
90
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
93 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
92 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
94
93
95 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a
94 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a