Apply suggestions from code review

Co-authored-by: Phil de Joux <[email protected]>

Author: mpickering

Cabal/src/Distribution/Simple/InstallDirs.hs

@@ -576,14 +576,14 @@ installDirsGrammar =
     <*> optionalFieldDef "libdir" installDirsLibdirLens mempty
     <*> optionalFieldDef "libsubdir" installDirsLibsubdirLens mempty
     <*> optionalFieldDef "dynlibdir" installDirsDynlibdirLens mempty
-    <*> (pure NoFlag) -- flibdir
+    <*> pure NoFlag -- flibdir
     <*> optionalFieldDef "libexecdir" installDirsLibexecdirLens mempty
     <*> optionalFieldDef "libexecsubdir" installDirsLibexecsubdirLens mempty
-    <*> (pure NoFlag) -- includedir
+    <*> pure NoFlag -- includedir
     <*> optionalFieldDef "datadir" installDirsDatadirLens mempty
     <*> optionalFieldDef "datasubdir" installDirsDatasubdirLens mempty
     <*> optionalFieldDef "docdir" installDirsDocdirLens mempty
-    <*> (pure NoFlag) -- mandir
+    <*> pure NoFlag -- mandir
     <*> optionalFieldDef "htmldir" installDirsHtmldirLens mempty
     <*> optionalFieldDef "haddockdir" installDirsHaddockdirLens mempty
     <*> optionalFieldDef "sysconfdir" installDirsSysconfdirLens mempty

Cabal/src/Distribution/Simple/PackageDescription.hs

@@ -103,7 +103,7 @@ parseString
   -> BS.ByteString
   -> IO a
 parseString parser verbosity name bs = do
-  let (warnings, result) = runParseResult $ withSource (PCabalFile (name, bs)) $ (parser bs)
+  let (warnings, result) = runParseResult $ withSource (PCabalFile (name, bs)) (parser bs)
   traverse_ (warn verbosity . showPWarningWithSource . fmap renderCabalFileSource) (flattenDups verbosity warnings)
   case result of
     Right x -> return x

Cabal/src/Distribution/Types/DumpBuildInfo.hs

@@ -22,6 +22,4 @@ parsecDumpBuildInfo :: CabalParsing m => m DumpBuildInfo
 parsecDumpBuildInfo = boolToDumpBuildInfo <$> parsec
 
 boolToDumpBuildInfo :: Bool -> DumpBuildInfo
-boolToDumpBuildInfo bool = case bool of
-  True -> DumpBuildInfo
-  _ -> NoDumpBuildInfo
+boolToDumpBuildInfo bool = if bool then DumpBuildInfo else NoDumpBuildInfo

cabal-install/parser-tests/Tests/ParserTests.hs

@@ -153,7 +153,7 @@ testProjectConfigBuildOnly = do
     projectConfigOnlyDownload = mempty -- cli only
     projectConfigSummaryFile = toNubList [toPathTemplate "summaryFile", toPathTemplate "summaryFile2"]
     projectConfigLogFile = toFlag $ toPathTemplate "myLog.log"
-    projectConfigBuildReports = toFlag $ DetailedReports
+    projectConfigBuildReports = toFlag DetailedReports
     projectConfigReportPlanningFailure = toFlag True
     projectConfigSymlinkBinDir = toFlag "some-bindir"
     projectConfigNumJobs = toFlag $ Just 4
@@ -266,7 +266,7 @@ testRemoteRepos = do
     expected = [packagesRepository, morePackagesRepository, secureLocalRepository]
     packagesRepository =
       RemoteRepo
-        { remoteRepoName = RepoName $ "packages.example.org"
+        { remoteRepoName = RepoName "packages.example.org"
         , remoteRepoURI = fromJust $ parseURI "http://packages.example.org/"
         , remoteRepoSecure = pure True
         , remoteRepoRootKeys = ["21", "42"]
@@ -275,7 +275,7 @@ testRemoteRepos = do
         }
     morePackagesRepository =
       RemoteRepo
-        { remoteRepoName = RepoName $ "more-packages.example.org"
+        { remoteRepoName = RepoName "more-packages.example.org"
         , remoteRepoURI = fromJust $ parseURI "https://more-packages.example.org/"
         , remoteRepoSecure = pure True
         , remoteRepoRootKeys = ["foo", "bar"]
@@ -284,7 +284,7 @@ testRemoteRepos = do
         }
     secureLocalRepository =
       RemoteRepo
-        { remoteRepoName = RepoName $ "my-secure-local-repository"
+        { remoteRepoName = RepoName "my-secure-local-repository"
         , remoteRepoURI = fromJust $ parseURI "file:/path/to/secure/repo"
         , remoteRepoSecure = pure True
         , remoteRepoRootKeys = ["123"]
@@ -302,13 +302,13 @@ testLocalNoIndexRepos = do
     expected = [myRepository, mySecureRepository]
     myRepository =
       LocalRepo
-        { localRepoName = RepoName $ "my-repository"
+        { localRepoName = RepoName "my-repository"
         , localRepoPath = normalisePath "/absolute/path/to/directory"
         , localRepoSharedCache = False
         }
     mySecureRepository =
       LocalRepo
-        { localRepoName = RepoName $ "my-other-repository"
+        { localRepoName = RepoName "my-other-repository"
         , localRepoPath = normalisePath "/another/path/to/repository"
         , localRepoSharedCache = False
         }

cabal-install/src/Distribution/Client/Check.hs

@@ -40,7 +40,7 @@ readGenericPackageDescriptionCheck verbosity fpath = do
     dieWithException verbosity $
       FileDoesntExist fpath
   bs <- BS.readFile fpath
-  let (warnings, result) = runParseResult $ withSource (PCabalFile (fpath, bs)) $ (parseGenericPackageDescription bs)
+  let (warnings, result) = runParseResult $ withSource (PCabalFile (fpath, bs)) (parseGenericPackageDescription bs)
   case result of
     Left (mspecVersion, errors) -> do
       dieWithException verbosity (CabalCheckParseError (CabalFileParseError fpath bs errors mspecVersion warnings))

cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs

@@ -124,7 +124,7 @@ clientInstallFlagsGrammar
   :: ( FieldGrammar c g
      , Applicative (g ClientInstallFlags)
      , c (Identity (Flag Bool))
-     , c ((Flag' FilePathNT FilePath))
+     , c (Flag' FilePathNT FilePath)
      , c (Identity (Flag OverwritePolicy))
      , c (Identity (Flag InstallMethod))
      )