bb39b6e · reflex · git.iko.soy

git.iko.soy/reflex

More hlint fixes

commitbb39b6e3dc9f7705214326787d9a0e9f879f4e1c authorRyan Trinkle <ryan.trinkle@gmail.com> dateFri 13 Jul 2018, 23:48 (8 years ago) parent278f4cf

11 files changed+20−42

compare with develop

unifiedsplit

src/Data/Map/Misc.hs+1−1 src/Data/WeakBag.hs−2 src/Reflex/Adjustable/Class.hs+2−2 src/Reflex/Class.hs+4−12 src/Reflex/Collection.hs+1−1 src/Reflex/DynamicWriter/Base.hs+2−1 src/Reflex/Host/Class.hs−6 src/Reflex/Patch/IntMap.hs−1 src/Reflex/Query/Base.hs+3−3 src/Reflex/Query/Class.hs+1−2 src/Reflex/Spider/Internal.hs+6−11

src/Data/Map/Misc.hs+1−1

@@ -10,7 +10,7 @@ module Data.Map.Misc

1010 ) where

1111

1212import Data.Align

13−import Data.Either

13+import Data.Either (isLeft)

1414import Data.Map (Map)

1515import qualified Data.Map as Map

1616import Data.Maybe

src/Data/WeakBag.hs−2

@@ -72,8 +72,6 @@ insert a (WeakBag nextId children) wbRef finalizer = {-# SCC "insert" #-} do

7272 let !csWithoutMe = IntMap.delete myId cs

7373 in (csWithoutMe, csWithoutMe)

7474 when (IntMap.null csWithoutMe) $ finalizer b

75− return ()

76− return ()

7775 wa <- mkWeakPtr a' $ Just cleanup

7876 atomicModifyIORef' children $ \cs -> (IntMap.insert myId wa cs, ())

7977 return $ WeakBagTicket

src/Reflex/Adjustable/Class.hs+2−2

@@ -18,8 +18,8 @@ module Reflex.Adjustable.Class

1818 , mapMapWithAdjustWithMove

1919 ) where

2020

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

22−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

21+import Control.Monad.Identity

22+import Control.Monad.Reader

2323import Data.Align

2424import Data.Dependent.Map (DMap, GCompare (..))

2525import Data.Functor.Constant

src/Reflex/Class.hs+4−12

@@ -147,9 +147,9 @@ module Reflex.Class

147147 ) where

148148

149149import Control.Applicative

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

151−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

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

150+import Control.Monad.Identity

151+import Control.Monad.Reader

152+import Control.Monad.State.Strict

153153import Control.Monad.Trans.Cont (ContT)

154154import Control.Monad.Trans.Except (ExceptT)

155155import Control.Monad.Trans.RWS (RWST)

@@ -160,11 +160,9 @@ import Data.Coerce

160160import Data.Default

161161import Data.Dependent.Map (DMap, DSum (..), GCompare (..))

162162import qualified Data.Dependent.Map as DMap

163−import Data.Either

164163import Data.FastMutableIntMap (PatchIntMap)

165164import Data.Foldable

166−import Data.Functor.Bind hiding (join)

167−import qualified Data.Functor.Bind as Bind

165+import Data.Functor.Bind

168166import Data.Functor.Constant

169167import Data.Functor.Misc

170168import Data.Functor.Plus

@@ -172,19 +170,13 @@ import Data.IntMap.Strict (IntMap)

172170import qualified Data.IntMap.Strict as IntMap

173171import Data.List.NonEmpty (NonEmpty (..))

174172import Data.Map (Map)

175−import Data.Maybe

176−import Data.Monoid hiding (Alt, (<>))

177173import Data.Semigroup (Semigroup, sconcat, stimes, (<>))

178174import Data.String

179175import Data.These

180−import Data.Traversable

181176import Data.Type.Coercion

182177import Reflex.FunctorMaybe

183178import Reflex.Patch

184179

185−-- Note: must come last to silence warnings due to AMP on GHC < 7.10

186−import Prelude hiding (foldl, mapM, mapM_, sequence, sequence_)

187−

188180import Debug.Trace (trace)

189181

190182-- | The 'Reflex' class contains all the primitive functionality needed for

src/Reflex/Collection.hs+1−1

@@ -25,7 +25,7 @@ module Reflex.Collection

2525 , simpleList

2626 ) where

2727

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

28+import Control.Monad.Identity

2929import Data.Align

3030import Data.Functor.Misc

3131import Data.Map (Map)

src/Reflex/DynamicWriter/Base.hs+2−1

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

66{-# LANGUAGE MultiParamTypeClasses #-}

77{-# LANGUAGE RankNTypes #-}

88{-# LANGUAGE ScopedTypeVariables #-}

9+{-# LANGUAGE TupleSections #-}

910{-# LANGUAGE TypeFamilies #-}

1011{-# LANGUAGE UndecidableInstances #-}

1112#ifdef USE_REFLEX_OPTIMIZER

@@ -78,7 +79,7 @@ mergeDynIncrementalWithMove a = unsafeBuildIncremental (mapM (sample . current)

7879 Just v -> do

7980 modify (k:)

8081 return $ MapWithMove.From_Insert v

81− noLongerMovedMap = Map.fromList $ fmap (\k -> (k, ())) noLongerMoved

82+ noLongerMovedMap = Map.fromList $ fmap (, ()) noLongerMoved

8283 in Map.differenceWith (\e _ -> Just $ MapWithMove.nodeInfoSetTo Nothing e) pWithNewVals noLongerMovedMap --TODO: Check if any in the second map are not covered?

8384

8485-- | A basic implementation of 'MonadDynamicWriter'.

src/Reflex/Host/Class.hs−6

@@ -30,8 +30,6 @@ module Reflex.Host.Class

3030

3131import Reflex.Class

3232

33−import Control.Applicative

34−import Control.Monad

3533import Control.Monad.Fix

3634import Control.Monad.Identity

3735import Control.Monad.Ref

@@ -45,10 +43,6 @@ import qualified Control.Monad.Trans.State.Strict as Strict

4543import Control.Monad.Trans.Writer (WriterT)

4644import Data.Dependent.Sum (DSum (..))

4745import Data.GADT.Compare

48−import Data.Monoid

49−

50−-- Note: this import must come last to silence warnings from AMP

51−import Prelude hiding (foldl, mapM, mapM_, sequence, sequence_)

5246

5347-- | Framework implementation support class for the reflex implementation

5448-- represented by @t@.

src/Reflex/Patch/IntMap.hs−1

@@ -10,7 +10,6 @@ import Data.IntMap.Strict (IntMap)

1010import qualified Data.IntMap.Strict as IntMap

1111import Data.Maybe

1212import Data.Semigroup

13−import Prelude hiding (lookup)

1413import Reflex.Patch.Class

1514

1615newtype PatchIntMap a = PatchIntMap (IntMap (Maybe a)) deriving (Functor, Foldable, Traversable, Monoid)

src/Reflex/Query/Base.hs+3−3

@@ -2,6 +2,7 @@

22{-# LANGUAGE GeneralizedNewtypeDeriving #-}

33{-# LANGUAGE InstanceSigs #-}

44{-# LANGUAGE KindSignatures #-}

5+{-# LANGUAGE LambdaCase #-}

56{-# LANGUAGE MultiParamTypeClasses #-}

67{-# LANGUAGE RankNTypes #-}

78{-# LANGUAGE ScopedTypeVariables #-}

@@ -253,7 +254,7 @@ dynWithQueryT f q = do

253254 return result

254255 where zipDynIncrementalWith g da ib =

255256 let eab = align (updated da) (updatedIncremental ib)

256− ec = flip push eab $ \o -> case o of

257+ ec = flip push eab $ \case

257258 This a -> do

258259 aOld <- sample $ current da

259260 b <- sample $ currentIncremental ib

@@ -274,8 +275,7 @@ instance (Monad m, Group q, Additive q, Query q, Reflex t) => MonadQuery t q (Qu

274275 askQueryResult = QueryT ask

275276 queryIncremental q = do

276277 tellQueryIncremental q

277− r <- askQueryResult

278− return $ zipDynWith crop (incrementalToDynamic q) r

278+ zipDynWith crop (incrementalToDynamic q) <$> askQueryResult

279279

280280instance Requester t m => Requester t (QueryT t q m) where

281281 type Request (QueryT t q m) = Request m

src/Reflex/Query/Class.hs+1−2

@@ -73,5 +73,4 @@ tellQueryDyn d = tellQueryIncremental $ unsafeBuildIncremental (sample (current

7373queryDyn :: (Reflex t, Monad m, MonadQuery t q m) => Dynamic t q -> m (Dynamic t (QueryResult q))

7474queryDyn q = do

7575 tellQueryDyn q

76− r <- askQueryResult

77− return $ zipDynWith crop q r

76+ zipDynWith crop q <$> askQueryResult

src/Reflex/Spider/Internal.hs+6−11

@@ -9,7 +9,6 @@

99{-# LANGUAGE GADTs #-}

1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}

1111{-# LANGUAGE LambdaCase #-}

12−{-# LANGUAGE MagicHash #-}

1312{-# LANGUAGE MultiParamTypeClasses #-}

1413{-# LANGUAGE MultiWayIf #-}

1514{-# LANGUAGE RankNTypes #-}

@@ -25,14 +24,16 @@

2524-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.

2625module Reflex.Spider.Internal (module Reflex.Spider.Internal) where

2726

28−import Control.Applicative

27+#if MIN_VERSION_base(4,10,0)

28+import Control.Applicative (liftA2)

29+#endif

2930import Control.Concurrent

3031import Control.Exception

31−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)

32+import Control.Monad hiding (forM, forM_, mapM, mapM_)

3233import Control.Monad.Exception

33−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)

34+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)

3435import Control.Monad.Primitive

35−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)

36+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)

3637import Control.Monad.Ref

3738import Data.Align

3839import Data.Coerce

@@ -41,7 +42,6 @@ import qualified Data.Dependent.Map as DMap

4142import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))

4243import qualified Data.FastMutableIntMap as FastMutableIntMap

4344import Data.Foldable hiding (concat, elem, sequence_)

44−import Data.Function

4545import Data.Functor.Constant

4646import Data.Functor.Misc

4747import Data.Functor.Product

@@ -49,13 +49,11 @@ import Data.GADT.Compare

4949import Data.IntMap.Strict (IntMap)

5050import qualified Data.IntMap.Strict as IntMap

5151import Data.IORef

52−import Data.List hiding (foldl')

5352import Data.Maybe

5453import Data.Monoid ((<>))

5554import Data.Proxy

5655import Data.These

5756import Data.Traversable

58−import Data.Word

5957import GHC.Exts

6058import GHC.IORef (IORef (..))

6159import GHC.Stack

@@ -88,9 +86,6 @@ import Reflex.NotReady.Class

8886import Reflex.Patch

8987import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove

9088

91−-- Note: must come last to silence warnings due to AMP on GHC < 7.10

92−import Prelude hiding (any, concat, mapM, mapM_, sequence)

93−

9489#ifdef DEBUG_TRACE_EVENTS

9590import qualified Data.ByteString.Char8 as BS8

9691import System.IO (stderr)