git.iko.soy/patch
on develop help sign in
Merge branch 'develop' into je-clean-up-changelog-traverse
commit250332386793167ab3a9b123c3a86d84b936cf60 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateFri 13 Dec 2019, 15:06 (7 years ago) parentfa938aca190592
4 files changed+8−7
compare with develop
unifiedsplit
ChangeLog.md+5−4 src/Control/Monad/ReaderIO.hs+1−1 src/Reflex/Collection.hs+1−1 test/Reflex/Bench/Focused.hs+1−1
ChangeLog.md+5−4
@@ -5,6 +5,7 @@
55* Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
66 They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
77
8+
89* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
910
1011* Add missing `NotReady` instances:
@@ -39,16 +40,16 @@
3940 * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
4041
4142* Generalize merging functions:
42− `merge` to `mergeG`,
43− `mergeIncremental` to `mergeIncrementalG`,
44− `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
43+ `merge` to `mergeG`,
44+ `mergeIncremental` to `mergeIncrementalG`,
45+ `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
4546
4647* Generalize distribute function:
4748 `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
4849
4950## 0.6.2.0
5051
51−* Fix `holdDyn` so that it is lazy in its event argument
52+* Fix `holdDyn` so that it is lazy in its event argument
5253 These produce `DMap`s whose values needn't be `Identity`.
5354
5455* Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
src/Control/Monad/ReaderIO.hs+1−1
@@ -37,7 +37,7 @@ instance Applicative (ReaderIO e) where
3737#if MIN_VERSION_base(4,10,0)
3838 liftA2 = liftM2
3939 {-# INLINE liftA2 #-}
40−#endif
40+#endif
4141 (*>) = (>>)
4242 {-# INLINE (*>) #-}
4343
src/Reflex/Collection.hs+1−1
@@ -130,7 +130,7 @@ listWithKeyShallowDiff initialVals valsChanged mkChild = do
130130 Nothing -> Just Nothing
131131
132132 -- We don't want to let spurious re-creations of items through
133− Just _ -> Nothing
133+ Just _ -> Nothing
134134 listHoldWithKey
135135 initialVals
136136 (attachWith (flip (Map.differenceWith relevantPatch))
test/Reflex/Bench/Focused.hs+1−1
@@ -134,7 +134,7 @@ holdDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynami
134134holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
135135
136136buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
137−buildDynChain = iterM (\d -> do
137+buildDynChain = iterM (\d -> do
138138 let b = fmap (+1) (current d)
139139 e = fmap (*2) (updated d)
140140 buildDynamic (sample b) e)