git.iko.soy/patch
on develop help sign in
Fix merges (#340)
eeeae5fOliver Batchelor
ChangeLog.md+9−2
compare with develop
unifiedsplit
@@ -3,14 +3,21 @@
3## 0.6.2.1
3## 0.6.2.1
4
4
5* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
5* 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
7
13
8* Generalize merging functions:
14* Generalize merging functions:
9 `merge` to `mergeG`,
15 `merge` to `mergeG`,
10 `mergeIncremental` to `mergeIncrementalG`,
16 `mergeIncremental` to `mergeIncrementalG`,
11− `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
12 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
17 `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
13
18
19+* Generalize distribute function:
20+ `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
14
21
15## 0.6.2.0
22## 0.6.2.0
16
23
default.nix+1
@@ -22,6 +22,7 @@ mkDerivation {
22 base bifunctors containers deepseq dependent-map dependent-sum
22 base bifunctors containers deepseq dependent-map dependent-sum
23 mtl ref-tf split transformers data-default
23 mtl ref-tf split transformers data-default
24 random time unbounded-delays monoidal-containers witherable
24 random time unbounded-delays monoidal-containers witherable
25+ profunctors
25 ] ++ (if ghc.isGhcjs or false then [
26 ] ++ (if ghc.isGhcjs or false then [
26 ghcjs-base
27 ghcjs-base
27 ] else []) ++ (if !useTemplateHaskell then [] else [
28 ] else []) ++ (if !useTemplateHaskell then [] else [
reflex.cabal+1−1
@@ -49,7 +49,7 @@ library
49 data-default >= 0.5 && < 0.8,
49 data-default >= 0.5 && < 0.8,
50 dependent-map >= 0.3 && < 0.4,
50 dependent-map >= 0.3 && < 0.4,
51 exception-transformers == 0.4.*,
51 exception-transformers == 0.4.*,
52− profunctors,
52+ profunctors >= 5.0 && < 6.0,
53 lens >= 4.7 && < 5,
53 lens >= 4.7 && < 5,
54 monad-control >= 1.0.1 && < 1.1,
54 monad-control >= 1.0.1 && < 1.1,
55 monoidal-containers >= 0.4 && < 0.6,
55 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
93 then Nothing
93 then Nothing
94 else Just currentOccurrences
94 else Just currentOccurrences
95
95
96+-- The instance signature doeesn't compile, leave commented for documentation
96− -- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
97+-- fanG :: GCompare k => Event (Pure t) (DMap k v) -> EventSelectorG (Pure t) k v
97 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
98 fanG e = EventSelectorG $ \k -> Event $ \t -> unEvent e t >>= DMap.lookup k
98
99
99 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a
100 switch :: Behavior (Pure t) (Event (Pure t) a) -> Event (Pure t) a