From 4e6e979e90d5d7027f8904eb1e686d4454321fc6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 22 Nov 2012 09:27:47 +0200 Subject: [PATCH] Stylish --- Stackage/Build.hs | 10 +++++----- Stackage/CheckPlan.hs | 10 +++++----- Stackage/Config.hs | 14 +++++++------- Stackage/InstallInfo.hs | 10 +++++----- Stackage/Test.hs | 19 ++++++++++--------- Stackage/Types.hs | 2 +- Stackage/Util.hs | 7 ++++--- 7 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Stackage/Build.hs b/Stackage/Build.hs index a2a7423b..a8d3f61a 100644 --- a/Stackage/Build.hs +++ b/Stackage/Build.hs @@ -2,14 +2,14 @@ module Stackage.Build ( build ) where -import Control.Monad (unless) +import Control.Monad (unless) import Stackage.CheckPlan +import Stackage.InstallInfo import Stackage.Test import Stackage.Util -import Stackage.InstallInfo -import System.Process (waitForProcess, runProcess) -import System.Exit (ExitCode (ExitSuccess), exitWith) -import System.IO (IOMode (WriteMode), withBinaryFile) +import System.Exit (ExitCode (ExitSuccess), exitWith) +import System.IO (IOMode (WriteMode), withBinaryFile) +import System.Process (runProcess, waitForProcess) build :: IO () build = do diff --git a/Stackage/CheckPlan.hs b/Stackage/CheckPlan.hs index 00fc7c1e..3f067f0d 100644 --- a/Stackage/CheckPlan.hs +++ b/Stackage/CheckPlan.hs @@ -2,12 +2,12 @@ module Stackage.CheckPlan ( checkPlan ) where -import Control.Monad (unless) -import Data.List (sort) -import Stackage.Types +import Control.Monad (unless) +import Data.List (sort) import Stackage.InstallInfo -import System.Process (readProcess) -import System.Exit (ExitCode (ExitFailure), exitWith) +import Stackage.Types +import System.Exit (ExitCode (ExitFailure), exitWith) +import System.Process (readProcess) data Mismatch = OnlyDryRun String | OnlySimpleList String deriving Show diff --git a/Stackage/Config.hs b/Stackage/Config.hs index e5ef4eba..ea2b5556 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -1,12 +1,12 @@ module Stackage.Config where -import qualified Data.Map as Map -import Stackage.Types -import Control.Monad.Trans.Writer (execWriter, tell) -import Data.Set (singleton, fromList) -import Control.Monad (when, unless) -import Distribution.System (OS (..), buildOS) -import Distribution.Text (simpleParse) +import Control.Monad (unless, when) +import Control.Monad.Trans.Writer (execWriter, tell) +import qualified Data.Map as Map +import Data.Set (fromList, singleton) +import Distribution.System (OS (..), buildOS) +import Distribution.Text (simpleParse) +import Stackage.Types -- | Packages which are shipped with GHC but are not included in the -- Haskell Platform list of core packages. diff --git a/Stackage/InstallInfo.hs b/Stackage/InstallInfo.hs index 83f27d5e..3a5305dc 100644 --- a/Stackage/InstallInfo.hs +++ b/Stackage/InstallInfo.hs @@ -3,14 +3,14 @@ module Stackage.InstallInfo , iiPackageList ) where -import Stackage.Types -import Stackage.Util +import qualified Data.Map as Map +import qualified Data.Set as Set import Stackage.Config +import Stackage.HaskellPlatform import Stackage.LoadDatabase import Stackage.NarrowDatabase -import Stackage.HaskellPlatform -import qualified Data.Map as Map -import qualified Data.Set as Set +import Stackage.Types +import Stackage.Util getInstallInfo :: IO InstallInfo getInstallInfo = do diff --git a/Stackage/Test.hs b/Stackage/Test.hs index f962d420..7e818637 100644 --- a/Stackage/Test.hs +++ b/Stackage/Test.hs @@ -2,17 +2,18 @@ module Stackage.Test ( runTestSuites ) where -import Control.Monad (when, foldM) -import qualified Data.Map as Map -import qualified Data.Set as Set +import Control.Monad (foldM, when) +import qualified Data.Map as Map +import qualified Data.Set as Set +import Stackage.Config import Stackage.Types import Stackage.Util -import Stackage.Config -import System.Directory (removeFile, createDirectory) -import System.Process (waitForProcess, runProcess) -import System.Exit (ExitCode (ExitSuccess)) -import System.FilePath ((), (<.>)) -import System.IO (IOMode (WriteMode, AppendMode), withBinaryFile) +import System.Directory (createDirectory, removeFile) +import System.Exit (ExitCode (ExitSuccess)) +import System.FilePath ((<.>), ()) +import System.IO (IOMode (WriteMode, AppendMode), + withBinaryFile) +import System.Process (runProcess, waitForProcess) runTestSuites :: InstallInfo -> IO () runTestSuites ii = do diff --git a/Stackage/Types.hs b/Stackage/Types.hs index 8bee0f72..0fecab02 100644 --- a/Stackage/Types.hs +++ b/Stackage/Types.hs @@ -40,6 +40,6 @@ instance Monoid HaskellPlatform where HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y) data InstallInfo = InstallInfo - { iiCore :: Set PackageName + { iiCore :: Set PackageName , iiPackages :: Map PackageName Version } diff --git a/Stackage/Util.hs b/Stackage/Util.hs index 9eeb6f21..037a25c5 100644 --- a/Stackage/Util.hs +++ b/Stackage/Util.hs @@ -1,12 +1,13 @@ module Stackage.Util where +import Control.Monad (when) import qualified Data.Map as Map import qualified Data.Set as Set +import Data.Version (showVersion) import Distribution.Version (thisVersion) -import Data.Version (showVersion) import Stackage.Types -import System.Directory (doesDirectoryExist, removeDirectoryRecursive) -import Control.Monad (when) +import System.Directory (doesDirectoryExist, + removeDirectoryRecursive) identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange identsToRanges =