git.iko.soy/reflex
on develop help sign in
-Wall/cabal check cleanup of imports not related to compatability.
commitbc216daf5e4bc0839288707a1cd5117ac4069cd3 authordavean <davean@xkcd.com> dateSun 14 Oct 2018, 17:42 (8 years ago) parent53559e1
4 files changed+9−14
compare with develop
unifiedsplit
reflex.cabal+3−5 src/Data/AppendMap.hs−1 test/Reflex/Test/CrossImpl.hs+2−4 test/Reflex/Test/Micro.hs+4−4
reflex.cabal+3−5
@@ -113,7 +113,6 @@ library
113113 Reflex.Workflow
114114
115115 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs -funbox-strict-fields -O2 -fspecialise-aggressively
116− ghc-prof-options: -fprof-auto
117116
118117 if flag(debug-trace-events)
119118 cpp-options: -DDEBUG_TRACE_EVENTS
@@ -139,7 +138,7 @@ library
139138 dependent-sum == 0.4.*
140139
141140 if flag(fast-weak) && impl(ghcjs)
142− ghc-options: -DGHCJS_FAST_WEAK
141+ cpp-options: -DGHCJS_FAST_WEAK
143142
144143 if impl(ghcjs)
145144 build-depends: ghcjs-base
@@ -173,7 +172,7 @@ test-suite CrossImpl
173172 type: exitcode-stdio-1.0
174173 main-is: Reflex/Test/CrossImpl.hs
175174 hs-source-dirs: test
176− ghc-options: -O2 -Wall -rtsopts -main-is Reflex.Test.CrossImpl.test
175+ ghc-options: -O2 -Wall -rtsopts
177176 build-depends:
178177 base,
179178 containers,
@@ -325,10 +324,9 @@ benchmark saulzar-bench
325324 c-sources: bench-cbits/checkCapability.c
326325 main-is: RunAll.hs
327326 ghc-options: -Wall -O2 -rtsopts -threaded
328− ghc-prof-options: -fprof-auto
329327 build-depends:
330328 base,
331− containers == 0.5.*,
329+ containers >= 0.5 && < 0.7,
332330 criterion == 1.1.*,
333331 deepseq >= 1.3 && < 1.5,
334332 dependent-map,
src/Data/AppendMap.hs−1
@@ -26,7 +26,6 @@ import Prelude hiding (map, null)
2626import Data.Coerce
2727import Data.Default
2828import Data.Map (Map)
29−import qualified Data.Map as Map hiding (showTree, showTreeWith)
3029import qualified Data.Map.Internal.Debug as Map (showTree, showTreeWith)
3130import Data.Map.Monoidal
3231import Reflex.Class (FunctorMaybe (..))
test/Reflex/Test/CrossImpl.hs+2−4
@@ -12,7 +12,6 @@
1212{-# LANGUAGE TypeFamilies #-}
1313{-# LANGUAGE TypeOperators #-}
1414{-# LANGUAGE UndecidableInstances #-}
15−module Reflex.Test.CrossImpl (test) where
1615
1716import Prelude hiding (and, foldl, mapM, mapM_, sequence, sequence_)
1817
@@ -26,7 +25,6 @@ import qualified Reflex.Spider.Internal as S
2625import Control.Arrow (second, (&&&))
2726import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
2827import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
29−import Control.Monad.Writer hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
3028import Data.Dependent.Map (DSum (..))
3129import Data.Foldable
3230import Data.Map.Strict (Map)
@@ -248,8 +246,8 @@ splitRecombineEvent e =
248246 in leftmost [ea, eb]
249247
250248
251−test :: IO ()
252−test = do
249+main :: IO ()
250+main = do
253251 results <- forM testCases $ \(name, TestCase inputs builder) -> do
254252 putStrLn $ "Test: " <> name
255253 testAgreement builder inputs
test/Reflex/Test/Micro.hs+4−4
@@ -263,13 +263,13 @@ testCases =
263263 , testB "factorDyn" $ do
264264 d <- holdDyn (Left "a") =<< eithers
265265
266− eithers <- eitherDyn d
266+ eithers' <- eitherDyn d
267267 let unFactor = either id id
268− return $ current (join (fmap unFactor eithers))
268+ return $ current (join (fmap unFactor eithers'))
269269
270270 , testB "pushDynDeep" $ do
271− e1 <- events1
272− e2 <- events2
271+ _ <- events1
272+ _ <- events2
273273
274274 d1 <- holdDyn "d1" =<< events1
275275 d2 <- holdDyn "d2" =<< events2