git.iko.soy/patch
on develop help sign in
Fix 7,8 issues hopefully
2f13f08Oliver Batchelor
test/Reflex/Bench/Focused.hs+4−4
compare with develop
unifiedsplit
@@ -9,8 +9,8 @@ import Control.Monad.Fix
9import Control.Monad
9import Control.Monad
10import Control.Monad.Identity
10import Control.Monad.Identity
11import Control.Applicative
11import Control.Applicative
12−import Data.Foldable
12+--import Data.Foldable
13−import Data.Traversable
13+import Data.Traversable (traverse, for)
14
14
15import Data.Maybe
15import Data.Maybe
16import Data.Map (Map)
16import Data.Map (Map)
@@ -27,7 +27,7 @@ import Data.Word
27import Data.Monoid
27import Data.Monoid
28
28
29
29
30−import Prelude hiding (sum, concat, forM)
30+import Prelude hiding (sum, concat)
31
31
32
32
33mergeTree :: Num a => (Monoid (f [a]), Functor f) => Int -> [f a] -> f a
33mergeTree :: Num a => (Monoid (f [a]), Functor f) => Int -> [f a] -> f a
@@ -284,7 +284,7 @@ fans n =
284 , testE "fanMerge " $ fanMerge n <$> events n
284 , testE "fanMerge " $ fanMerge n <$> events n
285
285
286 , testE "fmapFanMerge " $ fmapFanMerge n <$> events n
286 , 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)])
288
288
289 ]
289 ]
290 where
290 where
test/Reflex/Test.hs+1−1
@@ -21,7 +21,7 @@ import Data.Monoid
21
21
22import Data.IntMap (IntMap)
22import Data.IntMap (IntMap)
23
23
24−import Data.Foldable
24+--import Data.Foldable
25import System.Exit
25import System.Exit
26
26
27import Prelude
27import Prelude
test/Reflex/Test/RunAll.hs+1
@@ -6,6 +6,7 @@ import Reflex.Test
6
6
7import qualified Reflex.Bench.Focused as Focused
7import qualified Reflex.Bench.Focused as Focused
8import qualified Reflex.Test.Micro as Micro
8import qualified Reflex.Test.Micro as Micro
9+import Data.Functor
9import Data.Bifunctor
10import Data.Bifunctor
10import Data.List
11import Data.List
11
12