Skip to content

Commit bd3f014

Browse files
author
Ryan Trinkle
committed
Run stylish-haskell
1 parent d9a8872 commit bd3f014

29 files changed

+88
-73
lines changed

‎.stylish-haskell.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,5 @@ columns: 110
149149
# needs to be aware of these, so it can parse the file correctly.
150150
#
151151
# No language extensions are enabled by default.
152-
# language_extensions:
153-
# - TemplateHaskell
154-
# - QuasiQuotes
152+
language_extensions:
153+
- TemplateHaskell

‎src/Data/FastMutableIntMap.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ module Data.FastMutableIntMap
2424

2525
import Control.Monad.IO.Class
2626
import Data.Foldable (traverse_)
27-
import Data.IORef
2827
import Data.IntMap.Strict (IntMap)
2928
import qualified Data.IntMap.Strict as IntMap
29+
import Data.IORef
3030
import Data.Maybe
3131
import Prelude hiding (lookup)
3232
import Reflex.Patch.Class

‎src/Data/FastWeakBag.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import Control.Monad.IO.Class
3131

3232
#ifdef GHCJS_FAST_WEAK
3333
import GHCJS.Types
34-
import Reflex.FastWeak (unsafeFromRawJSVal, unsafeToRawJSVal, js_isNull)
34+
import Reflex.FastWeak (js_isNull, unsafeFromRawJSVal, unsafeToRawJSVal)
3535
#else
3636
import Control.Exception
3737
import Data.Foldable (forM_, mapM_)

‎src/Data/Functor/Misc.hs

+1-5
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,8 @@ dsumToEither = \case
245245
-- | We can't use @Compose Maybe@ instead of 'ComposeMaybe', because that would
246246
-- make the 'f' parameter have a nominal type role. We need f to be
247247
-- representational so that we can use safe 'coerce'.
248-
#if MIN_VERSION_transformers(5,2,0)
249248
newtype ComposeMaybe f a =
250-
#else
251-
newtype ComposeMaybe (f :: * -> *) (a :: *) =
252-
#endif
253-
ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)
249+
ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)
254250

255251
deriving instance Functor f => Functor (ComposeMaybe f)
256252

‎src/Data/Map/Misc.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE LambdaCase #-}
2-
module Data.Map.Misc
2+
module Data.Map.Misc
33
(
44
-- * Working with Maps
55
diffMapNoEq

‎src/Reflex.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module Reflex
77

88
import Reflex.Class as X
99
import Reflex.Collection as X
10+
import Reflex.Dynamic as X
1011
import Reflex.EventWriter.Base as X
1112
import Reflex.EventWriter.Class as X
12-
import Reflex.Dynamic as X
1313
#ifdef USE_TEMPLATE_HASKELL
1414
import Reflex.Dynamic.TH as X
1515
#endif

‎src/Reflex/Adjustable/Class.hs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{-# LANGUAGE CPP #-}
2+
{-# LANGUAGE FlexibleInstances #-}
3+
{-# LANGUAGE FunctionalDependencies #-}
4+
{-# LANGUAGE MultiParamTypeClasses #-}
25
{-# LANGUAGE RankNTypes #-}
36
{-# LANGUAGE ScopedTypeVariables #-}
4-
{-# LANGUAGE MultiParamTypeClasses #-}
5-
{-# LANGUAGE FunctionalDependencies #-}
6-
{-# LANGUAGE FlexibleInstances #-}
77
{-# LANGUAGE TypeFamilies #-}
88
{-# LANGUAGE UndecidableInstances #-}
99
#ifdef USE_REFLEX_OPTIMIZER
@@ -21,11 +21,11 @@ module Reflex.Adjustable.Class
2121
import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
2222
import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
2323
import Data.Align
24-
import Data.Map (Map)
25-
import qualified Data.Map as Map
2624
import Data.Dependent.Map (DMap, GCompare (..))
2725
import Data.Functor.Constant
2826
import Data.Functor.Misc
27+
import Data.Map (Map)
28+
import qualified Data.Map as Map
2929
import Data.Map.Misc
3030
import Data.These
3131

‎src/Reflex/Class.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE BangPatterns #-}
2-
{-# LANGUAGE ConstraintKinds #-}
32
{-# LANGUAGE CPP #-}
3+
{-# LANGUAGE ConstraintKinds #-}
44
{-# LANGUAGE DefaultSignatures #-}
55
{-# LANGUAGE FlexibleContexts #-}
66
{-# LANGUAGE FlexibleInstances #-}
@@ -150,17 +150,18 @@ import Control.Applicative
150150
import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
151151
import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
152152
import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
153-
import Control.Monad.Trans.Cont (ContT ())
154-
import Control.Monad.Trans.Except (ExceptT ())
155-
import Control.Monad.Trans.RWS (RWST ())
156-
import Control.Monad.Trans.Writer (WriterT ())
153+
import Control.Monad.Trans.Cont (ContT)
154+
import Control.Monad.Trans.Except (ExceptT)
155+
import Control.Monad.Trans.RWS (RWST)
156+
import Control.Monad.Trans.Writer (WriterT)
157157
import Data.Align
158158
import Data.Bifunctor
159159
import Data.Coerce
160160
import Data.Default
161161
import Data.Dependent.Map (DMap, DSum (..), GCompare (..))
162162
import qualified Data.Dependent.Map as DMap
163163
import Data.Either
164+
import Data.FastMutableIntMap (PatchIntMap)
164165
import Data.Foldable
165166
import Data.Functor.Bind hiding (join)
166167
import qualified Data.Functor.Bind as Bind
@@ -180,7 +181,6 @@ import Data.Traversable
180181
import Data.Type.Coercion
181182
import Reflex.FunctorMaybe
182183
import Reflex.Patch
183-
import Data.FastMutableIntMap (PatchIntMap)
184184

185185
-- Note: must come last to silence warnings due to AMP on GHC < 7.10
186186
import Prelude hiding (foldl, mapM, mapM_, sequence, sequence_)

‎src/Reflex/Collection.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{-# LANGUAGE CPP #-}
2-
{-# LANGUAGE RankNTypes #-}
2+
{-# LANGUAGE FlexibleInstances #-}
33
{-# LANGUAGE LambdaCase #-}
4+
{-# LANGUAGE MultiParamTypeClasses #-}
5+
{-# LANGUAGE RankNTypes #-}
46
{-# LANGUAGE RecursiveDo #-}
57
{-# LANGUAGE ScopedTypeVariables #-}
6-
{-# LANGUAGE MultiParamTypeClasses #-}
7-
{-# LANGUAGE FlexibleInstances #-}
88
{-# LANGUAGE TypeFamilies #-}
99
{-# LANGUAGE UndecidableInstances #-}
1010
#ifdef USE_REFLEX_OPTIMIZER
@@ -27,9 +27,9 @@ module Reflex.Collection
2727

2828
import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
2929
import Data.Align
30+
import Data.Functor.Misc
3031
import Data.Map (Map)
3132
import qualified Data.Map as Map
32-
import Data.Functor.Misc
3333
import Data.Map.Misc
3434
import Data.These
3535

‎src/Reflex/EventWriter/Class.hs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{-# LANGUAGE CPP #-}
33
{-# LANGUAGE FlexibleInstances #-}
44
{-# LANGUAGE FunctionalDependencies #-}
5+
{-# LANGUAGE MultiParamTypeClasses #-}
56
{-# LANGUAGE UndecidableInstances #-}
67
#ifdef USE_REFLEX_OPTIMIZER
78
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

‎src/Reflex/FastWeak.hs

+4-1
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,14 @@ emptyFastWeak = unsafeCoerce w
133133
where w :: FastWeak Any
134134
#ifdef GHCJS_FAST_WEAK
135135
w = js_emptyWeak
136-
foreign import javascript unsafe "$r = new h$FastWeak(null);" js_emptyWeak :: FastWeak Any
137136
#else
138137
w = unsafePerformIO $ do
139138
w' <- mkWeakPtr undefined Nothing
140139
finalize w'
141140
return w'
142141
#endif
143142
{-# NOINLINE emptyFastWeak #-}
143+
144+
#ifdef GHCJS_FAST_WEAK
145+
foreign import javascript unsafe "$r = new h$FastWeak(null);" js_emptyWeak :: FastWeak Any
146+
#endif

‎src/Reflex/Host/Class.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ import Control.Monad.Fix
3636
import Control.Monad.Identity
3737
import Control.Monad.Ref
3838
import Control.Monad.Trans
39-
import Control.Monad.Trans.Cont (ContT ())
40-
import Control.Monad.Trans.Except (ExceptT ())
41-
import Control.Monad.Trans.Reader (ReaderT ())
42-
import Control.Monad.Trans.RWS (RWST ())
43-
import Control.Monad.Trans.State (StateT ())
39+
import Control.Monad.Trans.Cont (ContT)
40+
import Control.Monad.Trans.Except (ExceptT)
41+
import Control.Monad.Trans.Reader (ReaderT)
42+
import Control.Monad.Trans.RWS (RWST)
43+
import Control.Monad.Trans.State (StateT)
4444
import qualified Control.Monad.Trans.State.Strict as Strict
45-
import Control.Monad.Trans.Writer (WriterT ())
45+
import Control.Monad.Trans.Writer (WriterT)
4646
import Data.Dependent.Sum (DSum (..))
4747
import Data.GADT.Compare
4848
import Data.Monoid

‎src/Reflex/NotReady/Class.hs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE DefaultSignatures #-}
3-
{-# LANGUAGE MultiParamTypeClasses #-}
3+
{-# LANGUAGE FlexibleContexts #-}
4+
{-# LANGUAGE FlexibleInstances #-}
45
{-# LANGUAGE FunctionalDependencies #-}
6+
{-# LANGUAGE MultiParamTypeClasses #-}
57
{-# LANGUAGE TypeFamilies #-}
6-
{-# LANGUAGE FlexibleInstances #-}
78
{-# LANGUAGE UndecidableInstances #-}
89
#ifdef USE_REFLEX_OPTIMIZER
910
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -12,17 +13,17 @@ module Reflex.NotReady.Class
1213
( NotReady(..)
1314
) where
1415

15-
import Control.Monad.Trans
1616
import Control.Monad.Reader (ReaderT)
17+
import Control.Monad.Trans
1718

1819
import Reflex.Class
20+
import Reflex.DynamicWriter.Base (DynamicWriterT)
21+
import Reflex.EventWriter.Base (EventWriterT)
1922
import Reflex.Host.Class
23+
import Reflex.PerformEvent.Base (PerformEventT (..))
2024
import Reflex.PostBuild.Base (PostBuildT)
21-
import Reflex.EventWriter.Base (EventWriterT)
22-
import Reflex.DynamicWriter.Base (DynamicWriterT)
2325
import Reflex.Query.Base (QueryT)
2426
import Reflex.Requester.Base (RequesterT)
25-
import Reflex.PerformEvent.Base (PerformEventT(..))
2627
import Reflex.TriggerEvent.Base (TriggerEventT)
2728

2829
class Monad m => NotReady t m | m -> t where

‎src/Reflex/Patch.hs

+8-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ module Reflex.Patch
88

99
import Reflex.Patch.Class as X
1010
import Reflex.Patch.DMap as X hiding (getDeletions)
11-
import Reflex.Patch.DMapWithMove as X (PatchDMapWithMove, const2PatchDMapWithMoveWith, patchDMapWithMoveToPatchMapWithMoveWith, mapPatchDMapWithMove, weakenPatchDMapWithMoveWith, traversePatchDMapWithMoveWithKey, unsafePatchDMapWithMove, unPatchDMapWithMove)
12-
import Reflex.Patch.Map as X
13-
import Reflex.Patch.MapWithMove as X (PatchMapWithMove, patchMapWithMoveNewElementsMap, patchMapWithMoveNewElements, unsafePatchMapWithMove, unPatchMapWithMove)
11+
import Reflex.Patch.DMapWithMove as X (PatchDMapWithMove, const2PatchDMapWithMoveWith, mapPatchDMapWithMove,
12+
patchDMapWithMoveToPatchMapWithMoveWith,
13+
traversePatchDMapWithMoveWithKey, unPatchDMapWithMove,
14+
unsafePatchDMapWithMove, weakenPatchDMapWithMoveWith)
1415
import Reflex.Patch.IntMap as X hiding (getDeletions)
16+
import Reflex.Patch.Map as X
17+
import Reflex.Patch.MapWithMove as X (PatchMapWithMove, patchMapWithMoveNewElements,
18+
patchMapWithMoveNewElementsMap, unPatchMapWithMove,
19+
unsafePatchMapWithMove)
1520

1621
import Data.Semigroup (Semigroup (..), (<>))
1722

‎src/Reflex/Patch/DMap.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import Reflex.Patch.Map
1414
import Data.Dependent.Map (DMap, DSum (..), GCompare (..))
1515
import qualified Data.Dependent.Map as DMap
1616
import Data.Functor.Constant
17-
import qualified Data.IntMap as IntMap
1817
import Data.Functor.Misc
18+
import qualified Data.IntMap as IntMap
1919
import qualified Data.Map as Map
2020
import Data.Semigroup (Semigroup (..))
2121
import Data.Some (Some)

‎src/Reflex/Patch/IntMap.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{-# LANGUAGE CPP #-}
2-
{-# LANGUAGE DeriveFunctor #-}
32
{-# LANGUAGE DeriveFoldable #-}
3+
{-# LANGUAGE DeriveFunctor #-}
44
{-# LANGUAGE DeriveTraversable #-}
55
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
66
{-# LANGUAGE TypeFamilies #-}
77
module Reflex.Patch.IntMap where
88

9-
import Prelude hiding (lookup)
109
import Data.IntMap.Strict (IntMap)
1110
import qualified Data.IntMap.Strict as IntMap
1211
import Data.Maybe
1312
import Data.Semigroup
13+
import Prelude hiding (lookup)
1414
import Reflex.Patch.Class
1515

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

‎src/Reflex/Patch/Map.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ module Reflex.Patch.Map where
77

88
import Reflex.Patch.Class
99

10-
import Data.Semigroup
1110
import Data.Map (Map)
1211
import qualified Data.Map as Map
1312
import Data.Maybe
13+
import Data.Semigroup
1414

1515
-- | A set of changes to a 'Map'. Any element may be inserted/updated or
1616
-- deleted. Insertions are represented as values wrapped in 'Just', while

‎src/Reflex/Profiled.hs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE EmptyDataDecls #-}
2+
{-# LANGUAGE FlexibleContexts #-}
23
{-# LANGUAGE FlexibleInstances #-}
34
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
45
{-# LANGUAGE InstanceSigs #-}
@@ -18,9 +19,9 @@ import Control.Monad.Ref
1819
import Control.Monad.State.Strict (StateT, execStateT, modify)
1920
import Data.Coerce
2021
import Data.Dependent.Map (DMap, GCompare)
21-
import Data.List
2222
import Data.FastMutableIntMap
2323
import Data.IORef
24+
import Data.List
2425
import Data.Map (Map)
2526
import qualified Data.Map.Strict as Map
2627
import Data.Monoid ((<>))
@@ -32,8 +33,8 @@ import GHC.Foreign
3233
import GHC.IO.Encoding
3334
import GHC.Stack
3435
import Reflex.Class
35-
import Reflex.PerformEvent.Class
3636
import Reflex.Host.Class
37+
import Reflex.PerformEvent.Class
3738

3839
import System.IO.Unsafe
3940
import Unsafe.Coerce

‎src/Reflex/Query/Base.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ import qualified Data.Some as Some
3737
import Data.These
3838

3939
import Reflex.Class
40-
import Reflex.EventWriter.Class
4140
import Reflex.EventWriter.Base
41+
import Reflex.EventWriter.Class
4242
import Reflex.Host.Class
43+
import qualified Reflex.Patch.MapWithMove as MapWithMove
4344
import Reflex.PerformEvent.Class
4445
import Reflex.PostBuild.Class
4546
import Reflex.Query.Class
4647
import Reflex.Requester.Class
4748
import Reflex.TriggerEvent.Class
48-
import qualified Reflex.Patch.MapWithMove as MapWithMove
4949

5050
newtype QueryT t q m a = QueryT { unQueryT :: StateT [Behavior t q] (EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m)) a }
5151
deriving (Functor, Applicative, Monad, MonadException, MonadFix, MonadIO, MonadHold t, MonadSample t, MonadAtomicRef)

‎src/Reflex/Requester/Base.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ import Data.Bits
4949
import Data.Coerce
5050
import Data.Dependent.Map (DMap, DSum (..))
5151
import qualified Data.Dependent.Map as DMap
52-
import qualified Data.Some as Some
5352
import Data.Functor.Compose
5453
import Data.Functor.Misc
5554
import Data.IntMap.Strict (IntMap)
5655
import qualified Data.IntMap.Strict as IntMap
5756
import Data.Map (Map)
5857
import qualified Data.Map as Map
5958
import Data.Monoid ((<>))
60-
import Data.Unique.Tag
59+
import Data.Proxy
6160
import qualified Data.Semigroup as S
6261
import Data.Some (Some)
62+
import qualified Data.Some as Some
6363
import Data.Type.Equality
64-
import Data.Proxy
64+
import Data.Unique.Tag
6565

6666
import GHC.Exts (Any)
6767
import Unsafe.Coerce

0 commit comments

Comments
 (0)