bc216da · patch · git.iko.soy

reflex.cabal+3−5

compare with develop

unifiedsplit

@@ -113,7 +113,6 @@ library

113 Reflex.Workflow

114

115 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs -funbox-strict-fields -O2 -fspecialise-aggressively

116− ghc-prof-options: -fprof-auto

117

116

118 if flag(debug-trace-events)

117 if flag(debug-trace-events)

119 cpp-options: -DDEBUG_TRACE_EVENTS

118 cpp-options: -DDEBUG_TRACE_EVENTS

@@ -139,7 +138,7 @@ library

139 dependent-sum == 0.4.*

138 dependent-sum == 0.4.*

140

139

141 if flag(fast-weak) && impl(ghcjs)

140 if flag(fast-weak) && impl(ghcjs)

142− ghc-options: -DGHCJS_FAST_WEAK

141+ cpp-options: -DGHCJS_FAST_WEAK

143

142

144 if impl(ghcjs)

143 if impl(ghcjs)

145 build-depends: ghcjs-base

144 build-depends: ghcjs-base

@@ -173,7 +172,7 @@ test-suite CrossImpl

173 type: exitcode-stdio-1.0

172 type: exitcode-stdio-1.0

174 main-is: Reflex/Test/CrossImpl.hs

173 main-is: Reflex/Test/CrossImpl.hs

175 hs-source-dirs: test

174 hs-source-dirs: test

176− ghc-options: -O2 -Wall -rtsopts -main-is Reflex.Test.CrossImpl.test

175+ ghc-options: -O2 -Wall -rtsopts

177 build-depends:

176 build-depends:

178 base,

177 base,

179 containers,

178 containers,

@@ -325,10 +324,9 @@ benchmark saulzar-bench

325 c-sources: bench-cbits/checkCapability.c

324 c-sources: bench-cbits/checkCapability.c

326 main-is: RunAll.hs

325 main-is: RunAll.hs

327 ghc-options: -Wall -O2 -rtsopts -threaded

326 ghc-options: -Wall -O2 -rtsopts -threaded

328− ghc-prof-options: -fprof-auto

329 build-depends:

327 build-depends:

330 base,

328 base,

331− containers == 0.5.*,

329+ containers >= 0.5 && < 0.7,

332 criterion == 1.1.*,

330 criterion == 1.1.*,

333 deepseq >= 1.3 && < 1.5,

331 deepseq >= 1.3 && < 1.5,

334 dependent-map,

332 dependent-map,

src/Data/AppendMap.hs−1

@@ -26,7 +26,6 @@ import Prelude hiding (map, null)

26import Data.Coerce

27import Data.Default

28import Data.Map (Map)

29−import qualified Data.Map as Map hiding (showTree, showTreeWith)

30import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)

29import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)

31import Data.Map.Monoidal

30import Data.Map.Monoidal

32import Reflex.Class (FunctorMaybe (..))

31import Reflex.Class (FunctorMaybe (..))

test/Reflex/Test/CrossImpl.hs+2−4

@@ -12,7 +12,6 @@

12{-# LANGUAGE TypeFamilies #-}

13{-# LANGUAGE TypeOperators #-}

14{-# LANGUAGE UndecidableInstances #-}

15−module Reflex.Test.CrossImpl (test) where

16

15

17import Prelude hiding (and, foldl, mapM, mapM_, sequence, sequence_)

16import Prelude hiding (and, foldl, mapM, mapM_, sequence, sequence_)

18

17

@@ -26,7 +25,6 @@ import qualified Reflex.Spider.Internal as S

26import Control.Arrow (second, (&&&))

25import Control.Arrow (second, (&&&))

27import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

26import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

28import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

27import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

29−import Control.Monad.Writer hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

30import Data.Dependent.Map (DSum (..))

28import Data.Dependent.Map (DSum (..))

31import Data.Foldable

29import Data.Foldable

32import Data.Map.Strict (Map)

30import Data.Map.Strict (Map)

@@ -248,8 +246,8 @@ splitRecombineEvent e =

248 in leftmost [ea, eb]

246 in leftmost [ea, eb]

249

247

250

248

251−test :: IO ()

249+main :: IO ()

252−test = do

250+main = do

253 results <- forM testCases $ \(name, TestCase inputs builder) -> do

251 results <- forM testCases $ \(name, TestCase inputs builder) -> do

254 putStrLn $ "Test: " <> name

252 putStrLn $ "Test: " <> name

255 testAgreement builder inputs

253 testAgreement builder inputs

test/Reflex/Test/Micro.hs+4−4

@@ -263,13 +263,13 @@ testCases =

263 , testB "factorDyn" $ do

264 d <- holdDyn (Left "a") =<< eithers

265

266− eithers <- eitherDyn d

266+ eithers' <- eitherDyn d

267 let unFactor = either id id

268− return $ current (join (fmap unFactor eithers))

268+ return $ current (join (fmap unFactor eithers'))

269

270 , testB "pushDynDeep" $ do

271− e1 <- events1

271+ _ <- events1

272− e2 <- events2

272+ _ <- events2

273

274 d1 <- holdDyn "d1" =<< events1

275 d2 <- holdDyn "d2" =<< events2