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

* Augment changelog, add profunctor bounds * Document commented instance signature

commiteeeae5f39b76d2779555fcf48e1868c9b12dc205 authorOliver Batchelor <saulzar@gmail.com> dateTue 6 Aug 2019, 16:16 (7 years ago) parent0bf106a
4 files changed+13−4
compare with develop
unifiedsplit
ChangeLog.md+9−2 default.nix+1 reflex.cabal+1−1 src/Reflex/Pure.hs+2−1
ChangeLog.md+9−2
@@ -3,14 +3,21 @@
33## 0.6.2.1
44
55* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
6− values.
6+ functor:
7+ * `fan` to `fanG`
8+ * `EventSelectorG` for `fanG` result selector.
9+
10+* Reduce the amount of unsafeCoerce in coercing newtypes under Event/Dynamic/Behavior.
11+ * Add fused ReaderIO for the purpose of coercion (ReaderT's third argument has nominal role preventing automated coerce)
12+ * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
713
814* Generalize merging functions:
915 `merge` to `mergeG`,
1016 `mergeIncremental` to `mergeIncrementalG`,
11− `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
1217 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
1318
19+* Generalize distribute function:
20+ `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
1421
1522## 0.6.2.0
1623
default.nix+1
@@ -22,6 +22,7 @@ mkDerivation {
2222 base bifunctors containers deepseq dependent-map dependent-sum
2323 mtl ref-tf split transformers data-default
2424 random time unbounded-delays monoidal-containers witherable
25+ profunctors
2526 ] ++ (if ghc.isGhcjs or false then [
2627 ghcjs-base
2728 ] else []) ++ (if !useTemplateHaskell then [] else [
reflex.cabal+1−1
@@ -49,7 +49,7 @@ library
4949 data-default >= 0.5 && < 0.8,
5050 dependent-map >= 0.3 && < 0.4,
5151 exception-transformers == 0.4.*,
52− profunctors,
52+ profunctors >= 5.0 && < 6.0,
5353 lens >= 4.7 && < 5,
5454 monad-control >= 1.0.1 && < 1.1,
5555 monoidal-containers >= 0.4 && < 0.6,
src/Reflex/Pure.hs+2−1
@@ -93,7 +93,8 @@ instance (Enum t, HasTrie t, Ord t) => Reflex (Pure t) where
9393 then Nothing
9494 else Just currentOccurrences
9595
96− -- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
96+-- The instance signature doeesn't compile, leave commented for documentation
97+-- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
9798 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
9899
99100 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a