Merge #3544

3544: stylish haskell changes r=coot a=coot

- stylish-haskell: let the script run over ouroboros-network packages
- stylish-haskell changes in the network layer


Co-authored-by: Marcin Szamotulski <[email protected]>

Author: iohk-bors[bot]

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

@@ -2,35 +2,37 @@
 {-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE QuantifiedConstraints  #-}
-{-# LANGUAGE ScopedTypeVariables    #-}
 {-# LANGUAGE RankNTypes             #-}
+{-# LANGUAGE ScopedTypeVariables    #-}
 {-# LANGUAGE TypeApplications       #-}
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
 
 module Control.Monad.Class.MonadAsync
   ( MonadAsync (..)
-  , AsyncCancelled(..)
-  , ExceptionInLinkedThread(..)
+  , AsyncCancelled (..)
+  , ExceptionInLinkedThread (..)
   , link
   , linkTo
   , linkOnly
   , linkToOnly
-
-  , mapConcurrently, forConcurrently
-  , mapConcurrently_, forConcurrently_
-  , replicateConcurrently, replicateConcurrently_
+  , mapConcurrently
+  , forConcurrently
+  , mapConcurrently_
+  , forConcurrently_
+  , replicateConcurrently
+  , replicateConcurrently_
   , Concurrently (..)
   ) where
 
 import           Prelude hiding (read)
 
 import           Control.Applicative (Alternative (..), liftA2)
+import           Control.Monad (forever)
 import           Control.Monad.Class.MonadFork
 import           Control.Monad.Class.MonadSTM
-import           Control.Monad.Class.MonadTimer
 import           Control.Monad.Class.MonadThrow
-import           Control.Monad (forever)
+import           Control.Monad.Class.MonadTimer
 
 import           Control.Concurrent.Async (AsyncCancelled (..))
 import qualified Control.Concurrent.Async as Async

io-classes/src/Control/Monad/Class/MonadEventlog.hs

@@ -1,8 +1,8 @@
-module Control.Monad.Class.MonadEventlog (
-    MonadEventlog(..),
+module Control.Monad.Class.MonadEventlog
+  ( MonadEventlog (..)
     -- * Deprecated API
-    traceEventM,
-    traceMarkerM
+  , traceEventM
+  , traceMarkerM
   ) where
 
 import           Control.Monad.Reader

io-classes/src/Control/Monad/Class/MonadFork.hs

@@ -7,7 +7,7 @@ module Control.Monad.Class.MonadFork
   ( MonadThread (..)
   , MonadFork (..)
   , labelThisThread
-  -- * Deprecated API
+    -- * Deprecated API
   , fork
   , forkWithUnmask
   ) where

io-classes/src/Control/Monad/Class/MonadST.hs

@@ -1,7 +1,5 @@
 {-# LANGUAGE RankNTypes #-}
-module Control.Monad.Class.MonadST
-  ( MonadST(..)
-  ) where
+module Control.Monad.Class.MonadST (MonadST (..)) where
 
 import           Control.Monad.Reader
 import           Control.Monad.ST (ST, stToIO)

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

@@ -8,8 +8,7 @@ module Control.Monad.Class.MonadSTM
   , MonadLabelledSTM (..)
   , LazyTVar
   , LazyTMVar
-
-  -- * Default 'TMVar' implementation
+    -- * Default 'TMVar' implementation
   , TMVarDefault (..)
   , labelTMVarDefault
   , newTMVarDefault
@@ -24,8 +23,7 @@ module Control.Monad.Class.MonadSTM
   , tryReadTMVarDefault
   , swapTMVarDefault
   , isEmptyTMVarDefault
-
-  -- * Default 'TBQueue' implementation
+    -- * Default 'TBQueue' implementation
   , TQueueDefault (..)
   , labelTQueueDefault
   , newTQueueDefault
@@ -35,8 +33,7 @@ module Control.Monad.Class.MonadSTM
   , tryPeekTQueueDefault
   , writeTQueueDefault
   , isEmptyTQueueDefault
-
-  -- * Default 'TBQueue' implementation
+    -- * Default 'TBQueue' implementation
   , TBQueueDefault (..)
   , labelTBQueueDefault
   , newTBQueueDefault
@@ -49,12 +46,10 @@ module Control.Monad.Class.MonadSTM
   , isFullTBQueueDefault
   , lengthTBQueueDefault
   , flushTBQueueDefault
-
-  -- * MonadThrow aliases
+    -- * MonadThrow aliases
   , throwSTM
   , catchSTM
-
-  -- * Deprecated API
+    -- * Deprecated API
   , newTVarM
   , newTMVarM
   , newTMVarMDefault
@@ -68,8 +63,8 @@ import qualified Control.Concurrent.STM.TBQueue as STM
 import qualified Control.Concurrent.STM.TMVar as STM
 import qualified Control.Concurrent.STM.TQueue as STM
 import qualified Control.Concurrent.STM.TVar as STM
-import qualified Control.Monad.STM as STM
 import           Control.Monad (MonadPlus (..))
+import qualified Control.Monad.STM as STM
 
 import qualified Control.Monad.Class.MonadThrow as MonadThrow
 
@@ -516,8 +511,8 @@ tryReadTBQueueDefault (TBQueue rsize read _wsize write _size) = do
       case reverse ys of
         [] -> return Nothing
 
-        -- NB. lazy: we want the transaction to be 
-        -- short, otherwise it will conflict       
+        -- NB. lazy: we want the transaction to be
+        -- short, otherwise it will conflict
         (z:zs)  -> do
           writeTVar write []
           writeTVar read zs

io-classes/src/Control/Monad/Class/MonadThrow.hs

@@ -7,18 +7,18 @@
 {-# LANGUAGE TypeFamilies              #-}
 
 module Control.Monad.Class.MonadThrow
-  ( MonadThrow(..)
-  , MonadCatch(..)
-  , MonadMask(..)
-  , MonadMaskingState(..)
-  , MonadEvaluate(..)
-  , MaskingState(..)
-  , Exception(..)
+  ( MonadThrow (..)
+  , MonadCatch (..)
+  , MonadMask (..)
+  , MonadMaskingState (..)
+  , MonadEvaluate (..)
+  , MaskingState (..)
+  , Exception (..)
   , SomeException
-  , ExitCase(..)
-  , Handler(..)
+  , ExitCase (..)
+  , Handler (..)
   , catches
-  -- * Deprecated interfaces
+    -- * Deprecated interfaces
   , throwM
   ) where
 

io-classes/src/Control/Monad/Class/MonadTime.hs

@@ -1,16 +1,14 @@
 {-# LANGUAGE DeriveGeneric #-}
 
-module Control.Monad.Class.MonadTime (
-    MonadTime(..)
-  , MonadMonotonicTime(..)
-
-  -- * 'DiffTime' and its action on 'Time'
-  , Time(..)
+module Control.Monad.Class.MonadTime
+  ( MonadTime (..)
+  , MonadMonotonicTime (..)
+    -- * 'DiffTime' and its action on 'Time'
+  , Time (..)
   , diffTime
   , addTime
   , DiffTime
-
-  -- * 'NominalTime' and its action on 'UTCTime'
+    -- * 'NominalTime' and its action on 'UTCTime'
   , UTCTime
   , diffUTCTime
   , addUTCTime
@@ -19,7 +17,7 @@ module Control.Monad.Class.MonadTime (
 
 import           Control.Monad.Reader
 import           Data.Time.Clock (DiffTime, NominalDiffTime, UTCTime,
-                   addUTCTime, diffUTCTime)
+                     addUTCTime, diffUTCTime)
 import qualified Data.Time.Clock as Time
 import           Data.Word (Word64)
 import           GHC.Generics (Generic (..))

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

@@ -5,11 +5,10 @@
 {-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE TypeFamilies       #-}
 
-module Control.Monad.Class.MonadTimer (
-    MonadDelay(..)
-  , MonadTimer(..)
-  , TimeoutState(..)
-
+module Control.Monad.Class.MonadTimer
+  ( MonadDelay (..)
+  , MonadTimer (..)
+  , TimeoutState (..)
   , DiffTime
   , diffTimeToMicrosecondsAsInt
   , microsecondsAsIntToDiffTime

io-classes/test/Test/MonadTimer.hs

@@ -1,9 +1,7 @@
 {-# LANGUAGE MultiWayIf         #-}
 {-# LANGUAGE NumericUnderscores #-}
 
-module Test.MonadTimer
-  ( tests
-  ) where
+module Test.MonadTimer (tests) where
 
 import           Control.Monad.Class.MonadTime (DiffTime)
 import           Control.Monad.Class.MonadTimer
@@ -68,7 +66,7 @@ instance Arbitrary DiffTimeDistr where
     shrink (DiffTimeDistr a) = (DiffTimeDistr . fromRational) `map` shrink (toRational a)
 
 prop_diffTimeToMicrosecondsAsIntRightInverse :: DiffTimeDistr -> Property
-prop_diffTimeToMicrosecondsAsIntRightInverse (DiffTimeDistr a) = 
+prop_diffTimeToMicrosecondsAsIntRightInverse (DiffTimeDistr a) =
     label (labelRational (toRational a)) $
       abs (toRational a - a') < (1 :% 1_000_000)
       .&&.

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

@@ -3,62 +3,62 @@
 {-# LANGUAGE RankNTypes          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Control.Monad.IOSim (
-  -- * Simulation monad
-  IOSim,
-  STMSim,
-  -- ** Run simulation
-  runSim,
-  runSimOrThrow,
-  runSimStrictShutdown,
-  Failure(..),
-  runSimTrace,
-  runSimTraceST,
-  liftST,
-  traceM,
-  traceSTM,
-  -- * Simulation time
-  setCurrentTime,
-  unshareClock,
-  -- * Simulation trace
-  type SimTrace,
-  Trace (Cons, Nil, Trace, SimTrace, TraceMainReturn, TraceMainException, TraceDeadlock),
-  ppTrace,
-  ppTrace_,
-  ppEvents,
-  SimResult(..),
-  SimEvent(..),
-  SimEventType(..),
-  ThreadLabel,
-  Labelled (..),
-  traceEvents,
-  traceResult,
-  selectTraceEvents,
-  selectTraceEvents',
-  selectTraceEventsDynamic,
-  selectTraceEventsDynamic',
-  selectTraceEventsSay,
-  selectTraceEventsSay',
-  traceSelectTraceEvents,
-  traceSelectTraceEventsDynamic,
-  traceSelectTraceEventsSay,
-  printTraceEventsSay,
-  -- * Eventlog
-  EventlogEvent(..),
-  EventlogMarker(..),
-  -- * Low-level API
-  execReadTVar,
-  -- * Deprecated interfaces
-  SimM,
-  SimSTM,
-  TraceEvent
+module Control.Monad.IOSim
+  ( -- * Simulation monad
+    IOSim
+  , STMSim
+    -- ** Run simulation
+  , runSim
+  , runSimOrThrow
+  , runSimStrictShutdown
+  , Failure (..)
+  , runSimTrace
+  , runSimTraceST
+  , liftST
+  , traceM
+  , traceSTM
+    -- * Simulation time
+  , setCurrentTime
+  , unshareClock
+    -- * Simulation trace
+  , type SimTrace
+  , Trace (Cons, Nil, Trace, SimTrace, TraceMainReturn, TraceMainException, TraceDeadlock)
+  , ppTrace
+  , ppTrace_
+  , ppEvents
+  , SimResult (..)
+  , SimEvent (..)
+  , SimEventType (..)
+  , ThreadLabel
+  , Labelled (..)
+  , traceEvents
+  , traceResult
+  , selectTraceEvents
+  , selectTraceEvents'
+  , selectTraceEventsDynamic
+  , selectTraceEventsDynamic'
+  , selectTraceEventsSay
+  , selectTraceEventsSay'
+  , traceSelectTraceEvents
+  , traceSelectTraceEventsDynamic
+  , traceSelectTraceEventsSay
+  , printTraceEventsSay
+    -- * Eventlog
+  , EventlogEvent (..)
+  , EventlogMarker (..)
+    -- * Low-level API
+  , execReadTVar
+    -- * Deprecated interfaces
+  , SimM
+  , SimSTM
+  , TraceEvent
   ) where
 
 import           Prelude
 
+import           Data.Bifoldable
 import           Data.Dynamic (fromDynamic)
 import           Data.List (intercalate)
-import           Data.Bifoldable
 import           Data.Typeable (Typeable)
 
 import           Data.List.Trace (Trace (..))