Follow hlint suggestion: redundant bracket

- Redundant bracket in Cabal-described
- Redundant bracket in Cabal-syntax
- Redundant bracket in Cabal
- Redundant bracket in cabal-install-solver
- Redundant bracket in cabal-install
- Redundant bracket in Cabal-QuickCheck
- Redundant bracket in Cabal-tests
- Redundant bracket in cabal-testsuite
- Update counts with hlint --default
- Realign vertically
- Fix formatting by putting all on one line
- Follow hlint suggestion: use section
- Don't apply HLint suggestions to Z modules
- Hold off changing the Z modules

Author: philderbeast

.hlint.yaml

@@ -1,11 +1,10 @@
 # Warnings currently triggered by your code
 - ignore: {name: "Avoid NonEmpty.unzip"} # 1 hint
 - ignore: {name: "Avoid lambda"} # 54 hints
-- ignore: {name: "Eta reduce"} # 137 hints
+- ignore: {name: "Eta reduce"} # 139 hints
 - ignore: {name: "Hoist not"} # 16 hints
 - ignore: {name: "Move filter"} # 4 hints
 - ignore: {name: "Redundant $!"} # 3 hints
-- ignore: {name: "Redundant bracket"} # 255 hints
 - ignore: {name: "Redundant guard"} # 1 hint
 - ignore: {name: "Redundant if"} # 6 hints
 - ignore: {name: "Redundant lambda"} # 16 hints
@@ -29,6 +28,14 @@
 - ignore: {name: "Functor law", within: [Test.Laws]}
 - ignore: {name: "Monoid law, left identity", within: [Test.Laws, UnitTests.Distribution.Utils.NubList]}
 - ignore: {name: "Monoid law, right identity", within: [Test.Laws, UnitTests.Distribution.Utils.NubList]}
+# Changing the Z modules will change the "Meta checks" CI job and fail its
+# "Check diff is clean" test. Wait until the 3.18 release before making changes
+# to these modules.
+- ignore:
+    name: "Redundant bracket"
+    within:
+      - Distribution.Simple.Build.PathsModule.Z
+      - Distribution.Simple.Build.Macros.Z
 - ignore: {name: "Replace case with maybe", within: [Distribution.Client.InLibrary]}
 - ignore: {name: "Use fmap", within: [Distribution.Client.HttpUtils, Distribution.Simple.SrcDist]}
 - ignore: {name: "Use fold", within: [Test.Laws]}

Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs

@@ -65,7 +65,7 @@ instance Arbitrary PackageName where
     arbitrary = mkPackageName . intercalate "-" <$> shortListOf1 2 nameComponent
       where
         nameComponent = shortListOf1 5 (elements packageChars)
-                        `suchThat` (liftA2 (&&) (not . all isDigit) (/= "all"))
+                        `suchThat` liftA2 (&&) (not . all isDigit) (/= "all")
         packageChars  = filter isAlphaNum ['\0'..'\127']
 
 instance Arbitrary PackageIdentifier where

Cabal-described/src/Distribution/Described.hs

@@ -426,7 +426,7 @@ instance Described IncludeRenaming where
         mr = describe (Proxy :: Proxy ModuleRenaming)
 
 instance Described Language where
-    describe _ = REUnion $ (REString . show) <$> reverse knownLanguages
+    describe _ = REUnion $ REString . show <$> reverse knownLanguages
 
 instance Described LegacyExeDependency where
     describe _ = RETodo

Cabal-syntax/src/Distribution/Fields/ConfVar.hs

@@ -154,7 +154,7 @@ parser = condOr
     updatePosition :: P.SourcePos -> SectionArg Position -> [SectionArg Position] -> P.SourcePos
     updatePosition x s _ =
       let Position line col = sectionArgAnn s
-       in P.setSourceLine (P.setSourceColumn x col) (line)
+       in P.setSourceLine (P.setSourceColumn x col) line
     prettySectionArg = show
 
     fromParsec :: Parsec a => Parser a

Cabal-syntax/src/Distribution/Fields/LexerMonad.hs

@@ -149,7 +149,7 @@ returnLex a = Lex $ \s -> LexResult s a
 
 {-# INLINE thenLex #-}
 thenLex :: Lex a -> (a -> Lex b) -> Lex b
-(Lex m) `thenLex` k = Lex $ \s -> case m s of LexResult s' a -> (unLex (k a)) s'
+(Lex m) `thenLex` k = Lex $ \s -> case m s of LexResult s' a -> unLex (k a) s'
 
 setPos :: Position -> Lex ()
 setPos pos = Lex $ \s -> LexResult s{curPos = pos} ()

Cabal-syntax/src/Distribution/Fields/ParseResult.hs

@@ -94,7 +94,7 @@ liftParseResult f pr = unPR pr emptyPRState initialCtx failure success
       pr' <- f a
       return $ PR $ \s' ctx failure' success' -> unPR pr' (concatPRState s s') ctx failure' success'
     concatPRState (PRState warnings errors version) (PRState warnings' errors' version') =
-      (PRState (warnings ++ warnings') (toList errors ++ errors') (version <|> version'))
+      PRState (warnings ++ warnings') (toList errors ++ errors') (version <|> version')
 
 withSource :: src -> ParseResult src a -> ParseResult src a
 withSource source (PR pr) = PR $ \s ctx failure success ->

Cabal-syntax/src/Distribution/Fields/Parser.hs

@@ -322,7 +322,7 @@ sectionLayoutOrBraces ilevel =
       closeBrace
       return elems
   )
-    <|> (elements ilevel)
+    <|> elements ilevel
 
 -- The body of a field, using either inline style or braces.
 --

Cabal-syntax/src/Distribution/PackageDescription/PrettyPrint.hs

@@ -185,7 +185,7 @@ ppCondBenchmarks v suites =
 ppCondition :: Condition ConfVar -> Doc
 ppCondition (Var x) = ppConfVar x
 ppCondition (Lit b) = text (show b)
-ppCondition (CNot c) = char '!' <<>> (ppCondition c)
+ppCondition (CNot c) = char '!' <<>> ppCondition c
 ppCondition (COr c1 c2) =
   parens
     ( hsep

Cabal-syntax/src/Distribution/Types/GenericPackageDescription/Lens.hs

@@ -52,23 +52,23 @@ condLibrary :: Lens' GenericPackageDescription (Maybe (CondTree ConfVar Library)
 condLibrary f s = fmap (\x -> s{T.condLibrary = x}) (f (T.condLibrary s))
 {-# INLINE condLibrary #-}
 
-condSubLibraries :: Lens' GenericPackageDescription [(UnqualComponentName, (CondTree ConfVar Library))]
+condSubLibraries :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar Library)]
 condSubLibraries f s = fmap (\x -> s{T.condSubLibraries = x}) (f (T.condSubLibraries s))
 {-# INLINE condSubLibraries #-}
 
-condForeignLibs :: Lens' GenericPackageDescription [(UnqualComponentName, (CondTree ConfVar ForeignLib))]
+condForeignLibs :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar ForeignLib)]
 condForeignLibs f s = fmap (\x -> s{T.condForeignLibs = x}) (f (T.condForeignLibs s))
 {-# INLINE condForeignLibs #-}
 
-condExecutables :: Lens' GenericPackageDescription [(UnqualComponentName, (CondTree ConfVar Executable))]
+condExecutables :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar Executable)]
 condExecutables f s = fmap (\x -> s{T.condExecutables = x}) (f (T.condExecutables s))
 {-# INLINE condExecutables #-}
 
-condTestSuites :: Lens' GenericPackageDescription [(UnqualComponentName, (CondTree ConfVar TestSuite))]
+condTestSuites :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar TestSuite)]
 condTestSuites f s = fmap (\x -> s{T.condTestSuites = x}) (f (T.condTestSuites s))
 {-# INLINE condTestSuites #-}
 
-condBenchmarks :: Lens' GenericPackageDescription [(UnqualComponentName, (CondTree ConfVar Benchmark))]
+condBenchmarks :: Lens' GenericPackageDescription [(UnqualComponentName, CondTree ConfVar Benchmark)]
 condBenchmarks f s = fmap (\x -> s{T.condBenchmarks = x}) (f (T.condBenchmarks s))
 {-# INLINE condBenchmarks #-}
 

Cabal-syntax/src/Distribution/Types/VersionRange/Internal.hs

@@ -365,25 +365,23 @@ versionRangeParser digitParser csv = expr
       P.spaces
       t <- term
       P.spaces
-      ( do
-          _ <- P.string "||"
-          checkOp
-          P.spaces
-          e <- expr
-          return (unionVersionRanges t e)
-          <|> return t
-        )
+      do
+        _ <- P.string "||"
+        checkOp
+        P.spaces
+        e <- expr
+        return (unionVersionRanges t e)
+        <|> return t
     term = do
       f <- factor
       P.spaces
-      ( do
-          _ <- P.string "&&"
-          checkOp
-          P.spaces
-          t <- term
-          return (intersectVersionRanges f t)
-          <|> return f
-        )
+      do
+        _ <- P.string "&&"
+        checkOp
+        P.spaces
+        t <- term
+        return (intersectVersionRanges f t)
+        <|> return f
     factor = parens expr <|> prim
 
     prim = do
@@ -392,21 +390,19 @@ versionRangeParser digitParser csv = expr
         "-" -> anyVersion <$ P.string "any" <|> P.string "none" *> noVersion'
         "==" -> do
           P.spaces
-          ( do
-              (wild, v) <- verOrWild
-              checkWild wild
-              pure $ (if wild then withinVersion else thisVersion) v
-              <|> (verSet' thisVersion =<< verSet)
-            )
+          do
+            (wild, v) <- verOrWild
+            checkWild wild
+            pure $ (if wild then withinVersion else thisVersion) v
+            <|> (verSet' thisVersion =<< verSet)
         "^>=" -> do
           P.spaces
-          ( do
-              (wild, v) <- verOrWild
-              when wild $
-                P.unexpected "wild-card version after ^>= operator"
-              majorBoundVersion' v
-              <|> (verSet' majorBoundVersion =<< verSet)
-            )
+          do
+            (wild, v) <- verOrWild
+            when wild $
+              P.unexpected "wild-card version after ^>= operator"
+            majorBoundVersion' v
+            <|> (verSet' majorBoundVersion =<< verSet)
         _ -> do
           P.spaces
           (wild, v) <- verOrWild