Merge branch 'develop' into je-clean-up-changelog-traverse

Author: Ericson2314

ChangeLog.md

@@ -5,6 +5,7 @@
 * Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
   They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
 
+
 * Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
 
 * Add missing `NotReady` instances:
@@ -39,16 +40,16 @@
     * Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
 
 * Generalize merging functions:
-  `merge` to `mergeG`, 
-  `mergeIncremental` to `mergeIncrementalG`, 
-  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.  
+  `merge` to `mergeG`,
+  `mergeIncremental` to `mergeIncrementalG`,
+  `mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
 
 * Generalize distribute function:
     `distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
 
 ## 0.6.2.0
 
-* Fix `holdDyn` so that it is lazy in its event argument  
+* Fix `holdDyn` so that it is lazy in its event argument
   These produce `DMap`s  whose values needn't be `Identity`.
 
 * Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).

src/Control/Monad/ReaderIO.hs

@@ -37,7 +37,7 @@ instance Applicative (ReaderIO e) where
 #if MIN_VERSION_base(4,10,0)
   liftA2 = liftM2
   {-# INLINE liftA2 #-}
-#endif  
+#endif
   (*>) = (>>)
   {-# INLINE (*>) #-}
 

src/Reflex/Collection.hs

@@ -130,7 +130,7 @@ listWithKeyShallowDiff initialVals valsChanged mkChild = do
         Nothing -> Just Nothing
 
         -- We don't want to let spurious re-creations of items through
-        Just _  -> Nothing 
+        Just _  -> Nothing
   listHoldWithKey
       initialVals
       (attachWith (flip (Map.differenceWith relevantPatch))

test/Reflex/Bench/Focused.hs

@@ -134,7 +134,7 @@ holdDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynami
 holdDynChain = iterM (\d -> sample (current d) >>= flip holdDyn (updated d))
 
 buildDynChain :: (Reflex t, MonadHold t m) => Word -> Dynamic t Word -> m (Dynamic t Word)
-buildDynChain = iterM (\d -> do 
+buildDynChain = iterM (\d -> do
     let b = fmap (+1) (current d)
         e = fmap (*2) (updated d)
     buildDynamic (sample b) e)