Fix some warnings and formatting

haskell · Apr 2, 2024 · f449135 · f449135
1 parent 409b6ac
commit f449135
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs
@@ -78,7 +78,6 @@ import Distribution.Client.VCS
   , validateSourceRepos
   )
 
-import GHC.Stack (HasCallStack, callStack)
 import Distribution.Client.BuildReports.Types
   ( ReportLevel (..)
   )
@@ -104,6 +103,7 @@ import Distribution.Client.HttpUtils
   )
 import Distribution.Client.Types
 import Distribution.Client.Utils.Parsec (renderParseError)
+import GHC.Stack (HasCallStack, callStack)
 
 import Distribution.Simple.Errors
 import Distribution.Simple.PackageDescription (flattenDups)

diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Parsec.hs
@@ -36,12 +36,12 @@ import Distribution.Fields.ConfVar (parseConditionConfVar)
 import Distribution.Fields.ParseResult
 
 -- AST type
-import Distribution.Fields (Field (..), FieldLine (..), FieldName, Name (..), PWarning, SectionArg (..), readFields', showPWarning)
+import Distribution.Fields (Field (..), FieldLine (..), FieldName, Name (..), SectionArg (..), readFields', showPWarning)
 import Distribution.Fields.LexerMonad (toPWarnings)
 import Distribution.Parsec (CabalParsing, PError (..), ParsecParser, parsec, parsecFilePath, parsecToken, runParsecParser)
 import Distribution.Parsec.Position (Position (..), zeroPos)
 import Distribution.Parsec.Warning (PWarnType (..))
-import Distribution.Simple.Program.Db (ProgramDb, defaultProgramDb, lookupKnownProgram, knownPrograms)
+import Distribution.Simple.Program.Db (ProgramDb, defaultProgramDb, knownPrograms, lookupKnownProgram)
 import Distribution.Simple.Program.Types (programName)
 import Distribution.Simple.Setup (Flag (..))
 import Distribution.Types.CondTree (CondBranch (..), CondTree (..))
@@ -95,7 +95,7 @@ parseProjectSkeleton cacheDir httpTransport verbosity seenImports source bs = (s
                   let res' = case result of
                         Right cfg -> pure cfg
                         Left (_, errors) -> do
-                          traverse_ (\(PError pos str) -> parseFailure pos str) errors
+                          traverse_ (\(PError errPos str) -> parseFailure errPos str) errors
                           parseFatalFailure pos $ "Failed to parse import " ++ importLoc
 
                   rest <- go [] xs
@@ -170,6 +170,7 @@ parseProjectSkeleton cacheDir httpTransport verbosity seenImports source bs = (s
 
     programDb = defaultProgramDb
 
+knownProgramNames :: ProgramDb -> [String]
 knownProgramNames programDb = (programName . fst) <$> knownPrograms programDb
 
 -- | Monad in which sections are parsed

diff --git a/cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs b/cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs
@@ -30,7 +30,7 @@ instance Parsec WriteGhcEnvironmentFilesPolicy where
       "never" -> return NeverWriteGhcEnvironmentFiles
       "ghc8.4.4+" -> return WriteGhcEnvironmentFilesOnlyForGhc844AndNewer
       policy ->
-        P.unexpected
-          $ "Cannot parse the GHC environment file write policy '"
-          <> policy
-          <> "'"
+        P.unexpected $
+          "Cannot parse the GHC environment file write policy '"
+            <> policy
+            <> "'"
diff --git a/cabal-install/src/Distribution/Client/Utils/Parsec.hs b/cabal-install/src/Distribution/Client/Utils/Parsec.hs
@@ -47,11 +47,11 @@ renderParseError
   -> [PWarning]
   -> String
 renderParseError filepath contents errors warnings =
-  unlines
-    $ [ "Errors encountered when parsing cabal file " <> filepath <> ":"
-      ]
-    ++ renderedErrors
-    ++ renderedWarnings
+  unlines $
+    [ "Errors encountered when parsing cabal file " <> filepath <> ":"
+    ]
+      ++ renderedErrors
+      ++ renderedWarnings
   where
     filepath' = normalise filepath