stylish-haskell cleanup

Stackage/BuildPlan.hs

@@ -29,9 +29,9 @@ import           Stackage.PackageIndex
 import           Stackage.Prelude
 
 data BuildPlan = BuildPlan
-    { bpSystemInfo :: SystemInfo
+    { bpSystemInfo  :: SystemInfo
-    , bpTools      :: Vector (PackageName, Version)
+    , bpTools       :: Vector (PackageName, Version)
-    , bpPackages   :: Map PackageName PackagePlan
+    , bpPackages    :: Map PackageName PackagePlan
     , bpGithubUsers :: Map Text (Set Text)
     }
     deriving (Show, Eq)

Stackage/CheckBuildPlan.hs

@@ -9,12 +9,12 @@ module Stackage.CheckBuildPlan
     ( checkBuildPlan
     ) where
 
-import Control.Monad.Writer.Strict  (Writer, execWriter, tell)
+import           Control.Monad.Writer.Strict (Writer, execWriter, tell)
-import Stackage.BuildConstraints
+import qualified Data.Text                   as T
-import Stackage.BuildPlan
+import           Stackage.BuildConstraints
-import Stackage.PackageDescription
+import           Stackage.BuildPlan
-import Stackage.Prelude
+import           Stackage.PackageDescription
-import qualified Data.Text as T
+import           Stackage.Prelude
 
 -- FIXME check cycles in dependencies, only looking at libraries and
 -- executables

Stackage/CompleteBuild.hs

@@ -6,11 +6,11 @@ module Stackage.CompleteBuild
     , BumpType (..)
     , completeBuild
     ) where
-import Data.Default.Class         (def)
+import Data.Default.Class        (def)
-import Data.Semigroup             (Max (..), Option (..))
+import Data.Semigroup            (Max (..), Option (..))
-import Data.Text.Read             (decimal)
+import Data.Text.Read            (decimal)
 import Data.Time
-import Data.Yaml                  (decodeFileEither, encodeFile)
+import Data.Yaml                 (decodeFileEither, encodeFile)
 import Network.HTTP.Client
 import Stackage.BuildConstraints
 import Stackage.BuildPlan
@@ -20,7 +20,7 @@ import Stackage.Prelude
 import Stackage.ServerBundle
 import Stackage.UpdateBuildPlan
 import Stackage.Upload
-import System.IO                  (BufferMode (LineBuffering), hSetBuffering)
+import System.IO                 (BufferMode (LineBuffering), hSetBuffering)
 
 data BuildType = Nightly | LTS BumpType
     deriving (Show, Read, Eq, Ord)

Stackage/CorePackages.hs

@@ -6,10 +6,10 @@ module Stackage.CorePackages
     , getGhcVersion
     ) where
 
-import qualified Data.Text         as T
+import qualified Data.Text        as T
-import           Filesystem        (listDirectory)
+import           Filesystem       (listDirectory)
 import           Stackage.Prelude
-import           System.Directory  (findExecutable)
+import           System.Directory (findExecutable)
 
 -- | Get a @Map@ of all of the core packages. Core packages are defined as
 -- packages which ship with GHC itself.

Stackage/PackageDescription.hs

@@ -51,7 +51,7 @@ instance FromJSON Component where
 
 data DepInfo = DepInfo
     { diComponents :: Set Component
-    , diRange :: VersionRange
+    , diRange      :: VersionRange
     }
     deriving (Show, Eq)
 

Stackage/PerformBuild.hs

@@ -1,10 +1,10 @@
 -- | Perform an actual build, generate a binary package database and a
 -- documentation directory in the process.
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE NoImplicitPrelude  #-}
 {-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
 module Stackage.PerformBuild
     ( performBuild
     , PerformBuild (..)
@@ -12,22 +12,25 @@ module Stackage.PerformBuild
     , pbDocDir
     ) where
 
-import Stackage.BuildConstraints
+import           Control.Concurrent.Async    (async)
-import Stackage.PackageDescription
+import           Control.Concurrent.STM.TSem
-import Stackage.BuildPlan
+import           Control.Monad.Writer.Strict (execWriter, tell)
-import Stackage.Prelude hiding (pi)
+import qualified Data.Map                    as Map
-import qualified Data.Map as Map
+import           Data.NonNull                (fromNullable)
-import Control.Concurrent.STM.TSem
+import           Filesystem                  (canonicalizePath, createTree,
-import Control.Monad.Writer.Strict (execWriter, tell)
+                                              getWorkingDirectory, isDirectory,
-import Data.NonNull (fromNullable)
+                                              removeTree, rename)
-import Control.Concurrent.Async (async)
+import           Filesystem.Path             (parent)
-import System.IO.Temp (withSystemTempDirectory)
+import qualified Filesystem.Path             as F
-import Filesystem (createTree, removeTree, isDirectory, rename, canonicalizePath, getWorkingDirectory)
+import           Stackage.BuildConstraints
-import System.IO (withBinaryFile, IOMode (WriteMode))
+import           Stackage.BuildPlan
-import Filesystem.Path (parent)
+import           Stackage.PackageDescription
-import qualified Filesystem.Path as F
+import           Stackage.Prelude            hiding (pi)
-import System.Environment (getEnvironment)
+import           System.Directory            (findExecutable)
-import System.Directory (findExecutable)
+import           System.Environment          (getEnvironment)
+import           System.IO                   (IOMode (WriteMode),
+                                              withBinaryFile)
+import           System.IO.Temp              (withSystemTempDirectory)
 
 data BuildException = BuildException (Map PackageName BuildFailure) [Text]
     deriving Typeable
@@ -51,18 +54,18 @@ data BuildFailure = DependencyFailed PackageName
 instance Exception BuildFailure
 
 data PerformBuild = PerformBuild
-    { pbPlan :: BuildPlan
+    { pbPlan          :: BuildPlan
-    , pbInstallDest :: FilePath
+    , pbInstallDest   :: FilePath
-    , pbLog :: ByteString -> IO ()
+    , pbLog           :: ByteString -> IO ()
-    , pbLogDir :: FilePath
+    , pbLogDir        :: FilePath
-    , pbJobs :: Int
+    , pbJobs          :: Int
     , pbGlobalInstall :: Bool
     -- ^ Register packages in the global database
     }
 
 data PackageInfo = PackageInfo
-    { piPlan :: PackagePlan
+    { piPlan   :: PackagePlan
-    , piName :: PackageName
+    , piName   :: PackageName
     , piResult :: TMVar Bool
     }
 
@@ -200,17 +203,17 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
 #endif
 
 data SingleBuild = SingleBuild
-    { sbSem :: TSem
+    { sbSem           :: TSem
-    , sbErrsVar :: TVar (Map PackageName BuildFailure)
+    , sbErrsVar       :: TVar (Map PackageName BuildFailure)
-    , sbWarningsVar :: TVar ([Text] -> [Text])
+    , sbWarningsVar   :: TVar ([Text] -> [Text])
-    , sbActive :: TVar Int
+    , sbActive        :: TVar Int
-    , sbToolMap :: Map ExeName (Set PackageName)
+    , sbToolMap       :: Map ExeName (Set PackageName)
-    , sbPackageMap :: Map PackageName PackageInfo
+    , sbPackageMap    :: Map PackageName PackageInfo
-    , sbBuildDir :: FilePath
+    , sbBuildDir      :: FilePath
-    , sbPackageInfo :: PackageInfo
+    , sbPackageInfo   :: PackageInfo
     , sbRegisterMutex :: MVar ()
-    , sbModifiedEnv :: [(String, String)]
+    , sbModifiedEnv   :: [(String, String)]
-    , sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
+    , sbHaddockFiles  :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
     }
 
 singleBuild :: PerformBuild -> SingleBuild -> IO ()

Stackage/ServerBundle.hs

@@ -9,18 +9,18 @@ module Stackage.ServerBundle
     , docsListing
     ) where
 
-import qualified Codec.Archive.Tar          as Tar
+import qualified Codec.Archive.Tar         as Tar
-import qualified Codec.Archive.Tar.Entry    as Tar
+import qualified Codec.Archive.Tar.Entry   as Tar
-import qualified Codec.Compression.GZip     as GZip
+import qualified Codec.Compression.GZip    as GZip
-import qualified Data.Yaml                  as Y
+import qualified Data.Yaml                 as Y
-import           Foreign.C.Types            (CTime (CTime))
+import           Filesystem                (isFile)
+import           Foreign.C.Types           (CTime (CTime))
 import           Stackage.BuildConstraints
 import           Stackage.BuildPlan
 import           Stackage.Prelude
-import qualified System.PosixCompat.Time    as PC
+import qualified System.PosixCompat.Time   as PC
-import qualified Text.XML as X
+import qualified Text.XML                  as X
-import Text.XML.Cursor
+import           Text.XML.Cursor
-import Filesystem (isFile)
 
 -- | Get current time
 epochTime :: IO Tar.EpochTime

Stackage/UpdateBuildPlan.hs

@@ -8,9 +8,9 @@ module Stackage.UpdateBuildPlan
     , updateBuildPlan
     ) where
 
-import qualified Data.Map                     as Map
+import qualified Data.Map                  as Map
-import           Distribution.Version         (anyVersion, earlierVersion,
+import           Distribution.Version      (anyVersion, earlierVersion,
-                                               orLaterVersion)
+                                            orLaterVersion)
 import           Stackage.BuildConstraints
 import           Stackage.BuildPlan
 import           Stackage.Prelude

Stackage/Upload.hs

@@ -20,9 +20,9 @@ import Data.Default.Class                    (Default (..))
 import Filesystem                            (isDirectory, isFile)
 import Network.HTTP.Client
 import Network.HTTP.Client.MultipartFormData
-import Stackage.BuildPlan                   (BuildPlan)
+import Stackage.BuildPlan                    (BuildPlan)
 import Stackage.Prelude
-import Stackage.ServerBundle                (bpAllPackages, docsListing)
+import Stackage.ServerBundle                 (bpAllPackages, docsListing)
 import System.IO.Temp                        (withSystemTempFile)
 
 newtype StackageServer = StackageServer { unStackageServer :: Text }
@@ -173,11 +173,11 @@ uploadHackageDistro bp username password =
         }
 
 data UploadDocMap = UploadDocMap
-    { udmServer :: StackageServer
+    { udmServer    :: StackageServer
     , udmAuthToken :: Text
-    , udmSnapshot :: SnapshotIdent
+    , udmSnapshot  :: SnapshotIdent
-    , udmDocDir :: FilePath
+    , udmDocDir    :: FilePath
-    , udmPlan :: BuildPlan
+    , udmPlan      :: BuildPlan
     }
 
 uploadDocMap :: UploadDocMap -> Manager -> IO (Response LByteString)