git.iko.soy/reflex
on develop help sign in
Fix 7,8 issues hopefully
commit2f13f0871572a55db90555e1ca2e67cd75096b71 authorOliver Batchelor <saulzar@gmail.com> dateWed 10 Feb 2016, 15:50 (11 years ago) parent8832408
3 files changed+6−5
compare with develop
unifiedsplit
test/Reflex/Bench/Focused.hs+4−4 test/Reflex/Test.hs+1−1 test/Reflex/Test/RunAll.hs+1
test/Reflex/Bench/Focused.hs+4−4
@@ -9,8 +9,8 @@ import Control.Monad.Fix
99import Control.Monad
1010import Control.Monad.Identity
1111import Control.Applicative
12−import Data.Foldable
13−import Data.Traversable
12+--import Data.Foldable
13+import Data.Traversable (traverse, for)
1414
1515import Data.Maybe
1616import Data.Map (Map)
@@ -27,7 +27,7 @@ import Data.Word
2727import Data.Monoid
2828
2929
30−import Prelude hiding (sum, concat, forM)
30+import Prelude hiding (sum, concat)
3131
3232
3333mergeTree :: Num a => (Monoid (f [a]), Functor f) => Int -> [f a] -> f a
@@ -284,7 +284,7 @@ fans n =
284284 , testE "fanMerge " $ fanMerge n <$> events n
285285
286286 , testE "fmapFanMerge " $ fmapFanMerge n <$> events n
287− , testE "triggerMerge" $ leftmost <$> forM [1..n] (\i -> plan [(i, i)])
287+ , testE "triggerMerge" $ leftmost <$> for [1..n] (\i -> plan [(i, i)])
288288
289289 ]
290290 where
test/Reflex/Test.hs+1−1
@@ -21,7 +21,7 @@ import Data.Monoid
2121
2222import Data.IntMap (IntMap)
2323
24−import Data.Foldable
24+--import Data.Foldable
2525import System.Exit
2626
2727import Prelude
test/Reflex/Test/RunAll.hs+1
@@ -6,6 +6,7 @@ import Reflex.Test
66
77import qualified Reflex.Bench.Focused as Focused
88import qualified Reflex.Test.Micro as Micro
9+import Data.Functor
910import Data.Bifunctor
1011import Data.List
1112