git.iko.soy/patch
on develop help sign in
Merge branch 'develop' into hlint
commit5300af13cdd830e16fc0a70ec3e709bb0ea7828b authorJohn Ericson <John.Ericson@Obsidian.Systems> dateFri 13 Dec 2019, 15:43 (7 years ago) parent225bcb8a190592
4 files changed+8−8
compare with develop
unifiedsplit
ChangeLog.md+5−5 src/Control/Monad/ReaderIO.hs+1−1 src/Reflex/Collection.hs+1−1 test/Reflex/Bench/Focused.hs+1−1
ChangeLog.md+5−5
@@ -5,7 +5,7 @@
55* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
66 renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
77 respectively.
8−
8+
99* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
1010
1111* Add missing `NotReady` instances:
@@ -40,16 +40,16 @@
4040 * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
4141
4242* Generalize merging functions:
43− `merge` to `mergeG`,
44− `mergeIncremental` to `mergeIncrementalG`,
45− `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
43+ `merge` to `mergeG`,
44+ `mergeIncremental` to `mergeIncrementalG`,
45+ `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
4646
4747* Generalize distribute function:
4848 `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
4949
5050## 0.6.2.0
5151
52−* Fix `holdDyn` so that it is lazy in its event argument
52+* Fix `holdDyn` so that it is lazy in its event argument
5353 These produce `DMap`s whose values needn't be `Identity`.
5454
5555* 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)