Various light reformatting

Author: mpilgrem

src/Data/Attoparsec/Args.hs

@@ -37,8 +37,8 @@ argsParser mode = many (P.skipSpace *> (quoted <|> unquoted)) <*
   unquoted = P.many1 naked
   quoted = P.char '"' *> str <* P.char '"'
   str = many ( case mode of
-                   Escaping -> escaped <|> nonquote
-                   NoEscaping -> nonquote
+                 Escaping -> escaped <|> nonquote
+                 NoEscaping -> nonquote
              )
   escaped = P.char '\\' *> P.anyChar
   nonquote = P.satisfy (/= '"')

src/Data/Attoparsec/Combinators.hs

@@ -11,8 +11,11 @@ module Data.Attoparsec.Combinators
 import           Stack.Prelude
 
 -- | Concatenate two parsers.
-appending :: (Applicative f, Semigroup a)
-                 => f a -> f a -> f a
+appending ::
+     (Applicative f, Semigroup a)
+  => f a
+  -> f a
+  -> f a
 appending a b = (<>) <$> a <*> b
 
 -- | Alternative parsers.

src/Options/Applicative/Builder/Extra.hs

@@ -345,21 +345,24 @@ pathCompleterWith PathCompleterOpts {..} = mkCompleter $ \inputRaw -> do
       | input == "" && pcoAbsolute -> pure ["/"]
       | otherwise -> pure []
     Just searchDir -> do
-      entries <- getDirectoryContents searchDir `catch` \(_ :: IOException) -> pure []
+      entries <-
+        getDirectoryContents searchDir `catch` \(_ :: IOException) -> pure []
       fmap catMaybes $ forM entries $ \entry ->
         -- Skip . and .. unless user is typing . or ..
-        if entry `elem` ["..", "."] && searchPrefix `notElem` ["..", "."] then pure Nothing else
-          if searchPrefix `isPrefixOf` entry
-            then do
-              let path = searchDir </> entry
-              case (pcoFileFilter path, pcoDirFilter path) of
-                (True, True) -> pure $ Just (inputSearchDir </> entry)
-                (fileAllowed, dirAllowed) -> do
-                  isDir <- doesDirectoryExist path
-                  if (if isDir then dirAllowed else fileAllowed)
-                    then pure $ Just (inputSearchDir </> entry)
-                    else pure Nothing
-            else pure Nothing
+        if entry `elem` ["..", "."] && searchPrefix `notElem` ["..", "."]
+          then pure Nothing
+          else
+            if searchPrefix `isPrefixOf` entry
+              then do
+                let path = searchDir </> entry
+                case (pcoFileFilter path, pcoDirFilter path) of
+                  (True, True) -> pure $ Just (inputSearchDir </> entry)
+                  (fileAllowed, dirAllowed) -> do
+                    isDir <- doesDirectoryExist path
+                    if (if isDir then dirAllowed else fileAllowed)
+                      then pure $ Just (inputSearchDir </> entry)
+                      else pure Nothing
+              else pure Nothing
 
 unescapeBashArg :: String -> String
 unescapeBashArg ('\'' : rest) = rest

src/Path/Extended.hs

@@ -1,8 +1,8 @@
 module Path.Extended
- ( fileExtension
- , addExtension
- , replaceExtension
- ) where
+  ( fileExtension
+  , addExtension
+  , replaceExtension
+  ) where
 
 import           Control.Monad.Catch
 import qualified Path
@@ -11,13 +11,15 @@ import           Path (Path, File)
 fileExtension :: MonadThrow m => Path b File -> m String
 fileExtension = Path.fileExtension
 
-addExtension :: MonadThrow m
+addExtension ::
+     MonadThrow m
   => String
   -> Path b File
   -> m (Path b File)
 addExtension = Path.addExtension
 
-replaceExtension :: MonadThrow m
+replaceExtension ::
+     MonadThrow m
   => String
   -> Path b File
   -> m (Path b File)

src/Path/Extra.hs

@@ -50,8 +50,13 @@ parseCollapsedAbsFile = parseAbsFile . collapseFilePath
 -- | Add a relative FilePath to the end of a Path
 -- We can't parse the FilePath first because we need to account for ".."
 -- in the FilePath (#2895)
-concatAndCollapseAbsDir :: MonadThrow m => Path Abs Dir -> FilePath -> m (Path Abs Dir)
-concatAndCollapseAbsDir base rel = parseCollapsedAbsDir (toFilePath base FP.</> rel)
+concatAndCollapseAbsDir ::
+     MonadThrow m
+  => Path Abs Dir
+  -> FilePath
+  -> m (Path Abs Dir)
+concatAndCollapseAbsDir base rel =
+  parseCollapsedAbsDir (toFilePath base FP.</> rel)
 
 -- | Collapse intermediate "." and ".." directories from a path.
 --
@@ -96,15 +101,17 @@ dropRoot (Path l) = Path (FP.dropDrive l)
 --
 -- > forgivingAbsence (resolveFile …) >>= rejectMissingFile
 
-rejectMissingFile :: MonadIO m
+rejectMissingFile ::
+     MonadIO m
   => Maybe (Path Abs File)
   -> m (Maybe (Path Abs File))
 rejectMissingFile Nothing = pure Nothing
 rejectMissingFile (Just p) = bool Nothing (Just p) <$> doesFileExist p
 
 -- | See 'rejectMissingFile'.
 
-rejectMissingDir :: MonadIO m
+rejectMissingDir ::
+     MonadIO m
   => Maybe (Path Abs Dir)
   -> m (Maybe (Path Abs Dir))
 rejectMissingDir Nothing = pure Nothing
@@ -122,4 +129,5 @@ pathToText :: Path b t -> T.Text
 pathToText = T.pack . toFilePath
 
 tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime)
-tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime
+tryGetModificationTime =
+  liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime

src/Path/Find.hs

@@ -19,18 +19,18 @@ import           System.PosixCompat.Files
                    ( getSymbolicLinkStatus, isSymbolicLink )
 
 -- | Find the location of a file matching the given predicate.
-findFileUp :: (MonadIO m,MonadThrow m)
-           => Path Abs Dir                -- ^ Start here.
-           -> (Path Abs File -> Bool)     -- ^ Predicate to match the file.
-           -> Maybe (Path Abs Dir)        -- ^ Do not ascend above this directory.
-           -> m (Maybe (Path Abs File))  -- ^ Absolute file path.
+findFileUp :: (MonadIO m, MonadThrow m)
+           => Path Abs Dir              -- ^ Start here.
+           -> (Path Abs File -> Bool)   -- ^ Predicate to match the file.
+           -> Maybe (Path Abs Dir)      -- ^ Do not ascend above this directory.
+           -> m (Maybe (Path Abs File)) -- ^ Absolute file path.
 findFileUp = findPathUp snd
 
 -- | Find the location of a directory matching the given predicate.
 findDirUp :: (MonadIO m,MonadThrow m)
-          => Path Abs Dir                -- ^ Start here.
-          -> (Path Abs Dir -> Bool)      -- ^ Predicate to match the directory.
-          -> Maybe (Path Abs Dir)        -- ^ Do not ascend above this directory.
+          => Path Abs Dir               -- ^ Start here.
+          -> (Path Abs Dir -> Bool)     -- ^ Predicate to match the directory.
+          -> Maybe (Path Abs Dir)       -- ^ Do not ascend above this directory.
           -> m (Maybe (Path Abs Dir))   -- ^ Absolute directory path.
 findDirUp = findPathUp fst
 

src/Stack/Build/ConstructPlan.hs

@@ -112,13 +112,14 @@ data AddDepRes
 data W = W
   { wFinals :: !(Map PackageName (Either ConstructPlanException Task))
   , wInstall :: !(Map Text InstallLocation)
-  -- ^ executable to be installed, and location where the binary is placed
+    -- ^ executable to be installed, and location where the binary is placed
   , wDirty :: !(Map PackageName Text)
-  -- ^ why a local package is considered dirty
+    -- ^ why a local package is considered dirty
   , wWarnings :: !([Text] -> [Text])
-  -- ^ Warnings
+    -- ^ Warnings
   , wParents :: !ParentMap
-  -- ^ Which packages a given package depends on, along with the package's version
+    -- ^ Which packages a given package depends on, along with the package's
+    -- version
   }
   deriving Generic
 
@@ -188,22 +189,20 @@ instance HasCompiler Ctx where
 instance HasEnvConfig Ctx where
   envConfigL = lens ctxEnvConfig (\x y -> x { ctxEnvConfig = y })
 
--- | Computes a build plan. This means figuring out which build 'Task's
--- to take, and the interdependencies among the build 'Task's. In
--- particular:
+-- | Computes a build plan. This means figuring out which build 'Task's to take,
+-- and the interdependencies among the build 'Task's. In particular:
 --
--- 1) It determines which packages need to be built, based on the
--- transitive deps of the current targets. For local packages, this is
--- indicated by the 'lpWanted' boolean. For extra packages to build,
--- this comes from the @extraToBuild0@ argument of type @Set
--- PackageName@. These are usually packages that have been specified on
--- the commandline.
+-- 1) It determines which packages need to be built, based on the transitive
+-- deps of the current targets. For local packages, this is indicated by the
+-- 'lpWanted' boolean. For extra packages to build, this comes from the
+-- @extraToBuild0@ argument of type @Set PackageName@. These are usually
+-- packages that have been specified on the command line.
 --
--- 2) It will only rebuild an upstream package if it isn't present in
--- the 'InstalledMap', or if some of its dependencies have changed.
+-- 2) It will only rebuild an upstream package if it isn't present in the
+-- 'InstalledMap', or if some of its dependencies have changed.
 --
--- 3) It will only rebuild a local package if its files are dirty or
--- some of its dependencies have changed.
+-- 3) It will only rebuild a local package if its files are dirty or some of its
+-- dependencies have changed.
 constructPlan ::
      forall env. HasEnvConfig env
   => BaseConfigOpts
@@ -374,14 +373,14 @@ data UnregisterState = UnregisterState
 -- already registered local packages
 mkUnregisterLocal ::
      Map PackageName Task
-  -- ^ Tasks
+     -- ^ Tasks
   -> Map PackageName Text
-  -- ^ Reasons why packages are dirty and must be rebuilt
+     -- ^ Reasons why packages are dirty and must be rebuilt
   -> [DumpPackage]
-  -- ^ Local package database dump
+     -- ^ Local package database dump
   -> Bool
-  -- ^ If true, we're doing a special initialBuildSteps build - don't unregister
-  -- target packages.
+     -- ^ If true, we're doing a special initialBuildSteps build - don't
+     -- unregister target packages.
   -> Map GhcPkgId (PackageIdentifier, Text)
 mkUnregisterLocal tasks dirtyReason localDumpPkgs initialBuildSteps =
   -- We'll take multiple passes through the local packages. This
@@ -764,8 +763,8 @@ installPackageGivenDeps isAllInOne buildHaddocks ps package minstalled
 packageBuildTypeConfig :: Package -> Bool
 packageBuildTypeConfig pkg = packageBuildType pkg == Configure
 
--- Update response in the lib map. If it is an error, and there's
--- already an error about cyclic dependencies, prefer the cyclic error.
+-- Update response in the lib map. If it is an error, and there's already an
+-- error about cyclic dependencies, prefer the cyclic error.
 updateLibMap :: PackageName -> Either ConstructPlanException AddDepRes -> M ()
 updateLibMap name val = modify $ \mp ->
   case (M.lookup name mp, val) of
@@ -778,15 +777,14 @@ addEllipsis t
   | otherwise = T.take 97 t <> "..."
 
 -- | Given a package, recurses into all of its dependencies. The results
--- indicate which packages are missing, meaning that their 'GhcPkgId's
--- will be figured out during the build, after they've been built. The
--- 2nd part of the tuple result indicates the packages that are already
--- installed which will be used.
+-- indicate which packages are missing, meaning that their 'GhcPkgId's will be
+-- figured out during the build, after they've been built. The 2nd part of the
+-- tuple result indicates the packages that are already installed which will be
+-- used.
 --
--- The 3rd part of the tuple is an 'InstallLocation'. If it is 'Local',
--- then the parent package must be installed locally. Otherwise, if it
--- is 'Snap', then it can either be installed locally or in the
--- snapshot.
+-- The 3rd part of the tuple is an 'InstallLocation'. If it is 'Local', then the
+-- parent package must be installed locally. Otherwise, if it is 'Snap', then it
+-- can either be installed locally or in the snapshot.
 addPackageDeps ::
      Package
   -> M ( Either
@@ -977,10 +975,10 @@ checkDirtiness ps installed package present buildHaddocks = do
                   <> addEllipsis (T.pack $ unwords $ Set.toList files)
                 Nothing -> Nothing
   case mreason of
-      Nothing -> pure False
-      Just reason -> do
-          tell mempty { wDirty = Map.singleton (packageName package) reason }
-          pure True
+    Nothing -> pure False
+    Just reason -> do
+      tell mempty { wDirty = Map.singleton (packageName package) reason }
+      pure True
 
 describeConfigDiff :: Config -> ConfigCache -> ConfigCache -> Maybe Text
 describeConfigDiff config old new
@@ -1027,8 +1025,8 @@ describeConfigDiff config old new
 
   userOpts = filter (not . isStackOpt)
            . (if configRebuildGhcOptions config
-                 then id
-                 else stripGhcOptions)
+                then id
+                else stripGhcOptions)
            . map T.pack
            . (\(ConfigureOpts x y) -> x ++ y)
            . configCacheOpts

src/Stack/Build/Execute.hs

@@ -940,9 +940,14 @@ toActions installedMap mtestLock runInBase ee (mbuild, mfinal) =
   beopts = boptsBenchmarkOpts bopts
 
 -- | Generate the ConfigCache
-getConfigCache :: HasEnvConfig env
-               => ExecuteEnv -> Task -> InstalledMap -> Bool -> Bool
-               -> RIO env (Map PackageIdentifier GhcPkgId, ConfigCache)
+getConfigCache ::
+     HasEnvConfig env
+  => ExecuteEnv
+  -> Task
+  -> InstalledMap
+  -> Bool
+  -> Bool
+  -> RIO env (Map PackageIdentifier GhcPkgId, ConfigCache)
 getConfigCache ExecuteEnv {..} task@Task {..} installedMap enableTest enableBench = do
   let extra =
         -- We enable tests if the test suite dependencies are already

src/Stack/Build/Source.hs

@@ -8,15 +8,15 @@
 
 -- Load information on package sources
 module Stack.Build.Source
-    ( projectLocalPackages
-    , localDependencies
-    , loadCommonPackage
-    , loadLocalPackage
-    , loadSourceMap
-    , getLocalFlags
-    , addUnlistedToBuildCache
-    , hashSourceMapData
-    ) where
+  ( projectLocalPackages
+  , localDependencies
+  , loadCommonPackage
+  , loadLocalPackage
+  , loadSourceMap
+  , getLocalFlags
+  , addUnlistedToBuildCache
+  , hashSourceMapData
+  ) where
 
 import              Conduit ( ZipSink (..), withSourceFile )
 import              Data.ByteString.Builder ( toLazyByteString )
@@ -171,8 +171,11 @@ hashSourceMapData boptsCli sm = do
       -- resolver 'ghc-X.Y.Z' is used, no extra-deps and e.g. user wants builds
       -- with profiling or without
       bootGhcOpts = map display (generalGhcOptions bc boptsCli False False)
-      hashedContent = toLazyByteString $ compilerPath <> compilerInfo <>
-          getUtf8Builder (mconcat bootGhcOpts) <> mconcat immDeps
+      hashedContent =
+           toLazyByteString $ compilerPath
+        <> compilerInfo
+        <> getUtf8Builder (mconcat bootGhcOpts)
+        <> mconcat immDeps
   pure $ SourceMapHash (SHA256.hashLazyBytes hashedContent)
 
 depPackageHashableContent :: (HasConfig env) => DepPackage -> RIO env Builder
@@ -181,9 +184,9 @@ depPackageHashableContent DepPackage {..} =
     PLMutable _ -> pure ""
     PLImmutable pli -> do
       let flagToBs (f, enabled) =
-              if enabled
-                  then ""
-                  else "-" <> fromString (C.unFlagName f)
+            if enabled
+              then ""
+              else "-" <> fromString (C.unFlagName f)
           flags = map flagToBs $ Map.toList (cpFlags dpCommon)
           ghcOptions = map display (cpGhcOptions dpCommon)
           cabalConfigOpts = map display (cpCabalConfigOpts dpCommon)
@@ -396,12 +399,12 @@ loadLocalPackage pp = do
     , lpCabalFile = ppCabalFP pp
     , lpWanted = isWanted
     , lpComponents = nonLibComponents
-    -- TODO: refactor this so that it's easier to be sure that these
-    -- components are indeed unbuildable.
-    --
-    -- The reasoning here is that if the STLocalComps specification made it
-    -- through component parsing, but the components aren't present, then they
-    -- must not be buildable.
+      -- TODO: refactor this so that it's easier to be sure that these
+      -- components are indeed unbuildable.
+      --
+      -- The reasoning here is that if the STLocalComps specification made it
+      -- through component parsing, but the components aren't present, then they
+      -- must not be buildable.
     , lpUnbuildable = toComponents
         (exes `Set.difference` packageExes pkg)
         (tests `Set.difference` Map.keysSet (packageTests pkg))