git.iko.soy/patch
on develop help sign in
Merge branch 'develop' into hlint
5300af1John Ericson
ChangeLog.md+5−5
compare with develop
unifiedsplit
@@ -5,7 +5,7 @@
5* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
5* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
6 renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
6 renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
7 respectively.
7 respectively.
8−
8+
9* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
9* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
10
10
11* Add missing `NotReady` instances:
11* Add missing `NotReady` instances:
@@ -40,16 +40,16 @@
40 * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
40 * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
41
41
42* Generalize merging functions:
42* Generalize merging functions:
43− `merge` to `mergeG`,
43+ `merge` to `mergeG`,
44− `mergeIncremental` to `mergeIncrementalG`,
44+ `mergeIncremental` to `mergeIncrementalG`,
45− `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
45+ `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
46
46
47* Generalize distribute function:
47* Generalize distribute function:
48 `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
48 `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
49
49
50## 0.6.2.0
50## 0.6.2.0
51
51
52−* Fix `holdDyn` so that it is lazy in its event argument
52+* Fix `holdDyn` so that it is lazy in its event argument
53 These produce `DMap`s whose values needn't be `Identity`.
53 These produce `DMap`s whose values needn't be `Identity`.
54
54
55* Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
55* 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
37#if MIN_VERSION_base(4,10,0)
37#if MIN_VERSION_base(4,10,0)
38 liftA2 = liftM2
38 liftA2 = liftM2
39 {-# INLINE liftA2 #-}
39 {-# INLINE liftA2 #-}
40−#endif
40+#endif
41 (*>) = (>>)
41 (*>) = (>>)
42 {-# INLINE (*>) #-}
42 {-# INLINE (*>) #-}
43
43
src/Reflex/Collection.hs+1−1
@@ -130,7 +130,7 @@ listWithKeyShallowDiff initialVals valsChanged mkChild = do
130 Nothing -> Just Nothing
130 Nothing -> Just Nothing
131
131
132 -- We don't want to let spurious re-creations of items through
132 -- We don't want to let spurious re-creations of items through
133− Just _ -> Nothing
133+ Just _ -> Nothing
134 listHoldWithKey
134 listHoldWithKey
135 initialVals
135 initialVals
136 (attachWith (flip (Map.differenceWith relevantPatch))
136 (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
134holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
134holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
135
135
136buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
136buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
137−buildDynChain = iterM (\d -> do
137+buildDynChain = iterM (\d -> do
138 let b = fmap (+1) (current d)
138 let b = fmap (+1) (current d)
139 e = fmap (*2) (updated d)
139 e = fmap (*2) (updated d)
140 buildDynamic (sample b) e)
140 buildDynamic (sample b) e)