Skip to content

Commit 1c81f9e

Browse files
cootcoot
committed
Format with stylish-haskell 
1 parent cc143d8 commit 1c81f9e

File tree

17 files changed

+128
-132
lines changed

17 files changed

+128
-132
lines changed

‎io-classes/src/Control/Monad/Class/MonadAsync.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import Control.Monad.Class.MonadSTM
3737
import Control.Monad.Class.MonadThrow
3838
import Control.Monad.Class.MonadTimer
3939

40-
import Control.Monad.Trans (lift)
4140
import Control.Monad.Reader (ReaderT (..))
41+
import Control.Monad.Trans (lift)
4242

4343
import Control.Concurrent.Async (AsyncCancelled (..))
4444
import qualified Control.Concurrent.Async as Async

‎io-classes/src/Control/Monad/Class/MonadSTM.hs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ module Control.Monad.Class.MonadSTM
1919
( MonadSTM (..)
2020
, MonadLabelledSTM (..)
2121
, MonadInspectSTM (..)
22-
, TraceValue (TraceValue, TraceDynamic, TraceString, DontTrace, traceDynamic,
23-
traceString)
22+
, TraceValue (TraceValue, TraceDynamic, TraceString, DontTrace, traceDynamic, traceString)
2423
, MonadTraceSTM (..)
2524
, LazyTVar
2625
, LazyTMVar
@@ -72,7 +71,7 @@ module Control.Monad.Class.MonadSTM
7271
, newTMVarMDefault
7372
, newEmptyTMVarM
7473
, newEmptyTMVarMDefault
75-
--
74+
--
7675
, WrappedSTM (..)
7776
) where
7877

@@ -85,12 +84,12 @@ import qualified Control.Concurrent.STM.TVar as STM
8584
import Control.Monad (MonadPlus (..))
8685
import qualified Control.Monad.STM as STM
8786

88-
import Control.Monad.Trans (lift)
89-
import Control.Monad.Cont (ContT (..))
87+
import Control.Monad.Cont (ContT (..))
9088
import Control.Monad.Except (ExceptT (..))
91-
import Control.Monad.RWS (RWST (..))
89+
import Control.Monad.RWS (RWST (..))
9290
import Control.Monad.Reader (ReaderT (..))
93-
import Control.Monad.State (StateT (..))
91+
import Control.Monad.State (StateT (..))
92+
import Control.Monad.Trans (lift)
9493
import Control.Monad.Writer (WriterT (..))
9594

9695
import qualified Control.Monad.Class.MonadThrow as MonadThrow
@@ -853,7 +852,7 @@ instance MonadSTM m => MonadSTM (ContT r m) where
853852
writeTVar = WrappedSTM .: writeTVar
854853
retry = WrappedSTM retry
855854
orElse = WrappedSTM .: on orElse runWrappedSTM
856-
855+
857856
modifyTVar = WrappedSTM .: modifyTVar
858857
modifyTVar' = WrappedSTM .: modifyTVar'
859858
stateTVar = WrappedSTM .: stateTVar
@@ -904,7 +903,7 @@ instance MonadSTM m => MonadSTM (ReaderT r m) where
904903
writeTVar = WrappedSTM .: writeTVar
905904
retry = WrappedSTM retry
906905
orElse = WrappedSTM .: on orElse runWrappedSTM
907-
906+
908907
modifyTVar = WrappedSTM .: modifyTVar
909908
modifyTVar' = WrappedSTM .: modifyTVar'
910909
stateTVar = WrappedSTM .: stateTVar
@@ -955,7 +954,7 @@ instance (Monoid w, MonadSTM m) => MonadSTM (WriterT w m) where
955954
writeTVar = WrappedSTM .: writeTVar
956955
retry = WrappedSTM retry
957956
orElse = WrappedSTM .: on orElse runWrappedSTM
958-
957+
959958
modifyTVar = WrappedSTM .: modifyTVar
960959
modifyTVar' = WrappedSTM .: modifyTVar'
961960
stateTVar = WrappedSTM .: stateTVar
@@ -1006,7 +1005,7 @@ instance MonadSTM m => MonadSTM (StateT s m) where
10061005
writeTVar = WrappedSTM .: writeTVar
10071006
retry = WrappedSTM retry
10081007
orElse = WrappedSTM .: on orElse runWrappedSTM
1009-
1008+
10101009
modifyTVar = WrappedSTM .: modifyTVar
10111010
modifyTVar' = WrappedSTM .: modifyTVar'
10121011
stateTVar = WrappedSTM .: stateTVar
@@ -1057,7 +1056,7 @@ instance MonadSTM m => MonadSTM (ExceptT e m) where
10571056
writeTVar = WrappedSTM .: writeTVar
10581057
retry = WrappedSTM retry
10591058
orElse = WrappedSTM .: on orElse runWrappedSTM
1060-
1059+
10611060
modifyTVar = WrappedSTM .: modifyTVar
10621061
modifyTVar' = WrappedSTM .: modifyTVar'
10631062
stateTVar = WrappedSTM .: stateTVar

‎io-classes/src/Control/Monad/Class/MonadTest.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Control.Monad.Class.MonadTest ( MonadTest (..) ) where
1+
module Control.Monad.Class.MonadTest (MonadTest (..)) where
22

33
import Control.Monad.Reader
44

‎io-classes/src/Control/Monad/Class/MonadTimer.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import Control.Monad (when)
2222
#endif
2323
import qualified Control.Monad.STM as STM
2424

25-
import Control.Monad.Trans (lift)
26-
import Control.Monad.Cont (ContT (..))
25+
import Control.Monad.Cont (ContT (..))
2726
import Control.Monad.Except (ExceptT (..))
28-
import Control.Monad.RWS (RWST (..))
27+
import Control.Monad.RWS (RWST (..))
2928
import Control.Monad.Reader (ReaderT (..))
30-
import Control.Monad.State (StateT (..))
29+
import Control.Monad.State (StateT (..))
30+
import Control.Monad.Trans (lift)
3131
import Control.Monad.Writer (WriterT (..))
3232

3333
import Data.Functor (void)

‎io-sim/bench/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module Main (main) where
66
import Control.Monad (replicateM)
77
import Control.Monad.Class.MonadAsync
88
import Control.Monad.Class.MonadFork
9-
import Control.Monad.Class.MonadSay
109
import Control.Monad.Class.MonadSTM
10+
import Control.Monad.Class.MonadSay
1111
import Control.Monad.Class.MonadThrow
1212
import Control.Monad.Class.MonadTimer
1313
import Control.Monad.IOSim

‎io-sim/src/Control/Monad/IOSim.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ module Control.Monad.IOSim
2727
, unshareClock
2828
-- * Simulation trace
2929
, type SimTrace
30-
, Trace (Cons, Nil, Trace, SimTrace, SimPORTrace, TraceDeadlock, TraceLoop,
31-
TraceMainReturn, TraceMainException, TraceRacesFound)
30+
, Trace (Cons, Nil, Trace, SimTrace, SimPORTrace, TraceDeadlock, TraceLoop, TraceMainReturn, TraceMainException, TraceRacesFound)
3231
, SimResult (..)
3332
, SimEvent (..)
3433
, SimEventType (..)
@@ -93,16 +92,16 @@ import Control.Monad.ST.Lazy
9392
import Control.Monad.Class.MonadThrow as MonadThrow
9493
import Control.Monad.Class.MonadTime
9594

96-
import Control.Monad.IOSim.Types
9795
import Control.Monad.IOSim.Internal
96+
import Control.Monad.IOSim.Types
9897
import Control.Monad.IOSimPOR.Internal (controlSimTraceST)
9998
import Control.Monad.IOSimPOR.QuickCheckUtils
10099

101100
import Test.QuickCheck
102101

103102

104-
import System.IO.Unsafe
105103
import Data.IORef
104+
import System.IO.Unsafe
106105

107106

108107
selectTraceEvents
@@ -360,7 +359,7 @@ runSimTrace mainAction = runST (runSimTraceST mainAction)
360359
controlSimTrace :: forall a.
361360
Maybe Int
362361
-> ScheduleControl
363-
-- ^ note: must be either `ControlDefault` or `ControlAwait`.
362+
-- ^ note: must be either `ControlDefault` or `ControlAwait`.
364363
-> (forall s. IOSim s a)
365364
-> SimTrace a
366365
controlSimTrace limit control mainAction =

‎io-sim/src/Control/Monad/IOSim/CommonTypes.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import Control.Monad.Class.MonadSTM (TraceValue)
1111
import Control.Monad.ST.Lazy
1212

1313
import Data.Map (Map)
14-
import Data.Set (Set)
1514
import Data.STRef.Lazy
15+
import Data.Set (Set)
1616

1717
data ThreadId = RacyThreadId [Int]
1818
| ThreadId [Int] -- non racy threads have higher priority
@@ -67,11 +67,11 @@ data TVar s a = TVar {
6767

6868
-- | The vector clock of the current value.
6969
--
70-
tvarVClock :: !(STRef s VectorClock),
70+
tvarVClock :: !(STRef s VectorClock),
7171

7272
-- | Callback to construct a trace which will be attached to the dynamic
7373
-- trace.
74-
tvarTrace :: !(STRef s (Maybe (Maybe a -> a -> ST s TraceValue)))
74+
tvarTrace :: !(STRef s (Maybe (Maybe a -> a -> ST s TraceValue)))
7575
}
7676

7777
instance Eq (TVar s a) where

‎io-sim/src/Control/Monad/IOSim/Internal.hs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,24 @@ module Control.Monad.IOSim.Internal
5353

5454
import Prelude hiding (read)
5555

56-
import Deque.Strict (Deque)
57-
import qualified Deque.Strict as Deque
58-
import Data.Foldable (traverse_, toList)
56+
import Data.Dynamic
57+
import Data.Foldable (toList, traverse_)
5958
import qualified Data.List as List
6059
import qualified Data.List.Trace as Trace
61-
import Data.Maybe (mapMaybe)
6260
import Data.Map.Strict (Map)
6361
import qualified Data.Map.Strict as Map
62+
import Data.Maybe (mapMaybe)
6463
import Data.OrdPSQ (OrdPSQ)
6564
import qualified Data.OrdPSQ as PSQ
6665
import Data.Set (Set)
6766
import qualified Data.Set as Set
6867
import Data.Time (UTCTime (..), fromGregorian)
69-
import Data.Dynamic
68+
import Deque.Strict (Deque)
69+
import qualified Deque.Strict as Deque
7070

7171
import GHC.Exts (fromList)
7272

73-
import Control.Exception (NonTermination (..),
74-
assert, throw)
73+
import Control.Exception (NonTermination (..), assert, throw)
7574
import Control.Monad (join)
7675

7776
import Control.Monad (when)
@@ -84,10 +83,10 @@ import Control.Monad.Class.MonadThrow hiding (getMaskingState)
8483
import Control.Monad.Class.MonadTime
8584
import Control.Monad.Class.MonadTimer
8685

87-
import Control.Monad.IOSim.Types (SimEvent)
88-
import Control.Monad.IOSim.Types hiding (SimEvent (SimPOREvent),
89-
Trace(SimPORTrace))
9086
import Control.Monad.IOSim.InternalTypes
87+
import Control.Monad.IOSim.Types hiding (SimEvent (SimPOREvent),
88+
Trace (SimPORTrace))
89+
import Control.Monad.IOSim.Types (SimEvent)
9190

9291
--
9392
-- Simulation interpreter
@@ -1093,7 +1092,7 @@ traceTVarST TVar{tvarCurrent, tvarUndo, tvarTrace} new = do
10931092
case (new, vs) of
10941093
(True, _) -> f Nothing v
10951094
(_, _:_) -> f (Just $ last vs) v
1096-
_ -> error "traceTVarST: unexpected tvar state"
1095+
_ -> error "traceTVarST: unexpected tvar state"
10971096

10981097

10991098

‎io-sim/src/Control/Monad/IOSim/InternalTypes.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ data ControlStack s b a where
4040
instance Show (ControlStack s b a) where
4141
show = show . dash
4242
where dash :: ControlStack s' b' a' -> ControlStackDash
43-
dash MainFrame = MainFrame'
44-
dash ForkFrame = ForkFrame'
45-
dash (MaskFrame _ m s) = MaskFrame' m (dash s)
43+
dash MainFrame = MainFrame'
44+
dash ForkFrame = ForkFrame'
45+
dash (MaskFrame _ m s) = MaskFrame' m (dash s)
4646
dash (CatchFrame _ _ s) = CatchFrame' (dash s)
4747

4848
data ControlStackDash =

‎io-sim/src/Control/Monad/IOSim/STM.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
--
88
module Control.Monad.IOSim.STM where
99

10-
import Control.Monad.Class.MonadSTM (MonadSTM (..),
11-
MonadInspectSTM (..), MonadLabelledSTM (..),
12-
MonadTraceSTM (..), TraceValue (..))
10+
import Control.Monad.Class.MonadSTM (MonadInspectSTM (..),
11+
MonadLabelledSTM (..), MonadSTM (..), MonadTraceSTM (..),
12+
TraceValue (..))
1313

1414
import Numeric.Natural (Natural)
1515

@@ -18,7 +18,7 @@ import Numeric.Natural (Natural)
1818
--
1919

2020
newtype TQueueDefault m a = TQueue (TVar m ([a], [a]))
21-
21+
2222
labelTQueueDefault
2323
:: MonadLabelledSTM m
2424
=> TQueueDefault m a -> String -> STM m ()
@@ -170,7 +170,7 @@ isEmptyTBQueueDefault (TBQueue queue _size) = do
170170
isFullTBQueueDefault :: MonadSTM m => TBQueueDefault m a -> STM m Bool
171171
isFullTBQueueDefault (TBQueue queue _size) = do
172172
(_, r, _, w) <- readTVar queue
173-
return $
173+
return $
174174
if (w > 0)
175175
then False
176176
else if (r > 0)

0 commit comments

Comments
 (0)