Merge of #11676

Author: mergify[bot]

.hlint.yaml

@@ -1,7 +1,6 @@
 # Warnings currently triggered by your code
 - ignore: {name: "Avoid NonEmpty.unzip"} # 1 hint
 - ignore: {name: "Avoid lambda"} # 51 hints
-- ignore: {name: "Avoid lambda using `infix`"} # 23 hints
 - ignore: {name: "Eta reduce"} # 138 hints
 - ignore: {name: "Hoist not"} # 16 hints
 - ignore: {name: "Move filter"} # 4 hints

Cabal-syntax/src/Distribution/Compat/CharParsing.hs

@@ -73,7 +73,7 @@ import Distribution.Compat.Parsing
 --
 -- >   vowel  = oneOf "aeiou"
 oneOf :: CharParsing m => [Char] -> m Char
-oneOf xs = satisfy (\c -> c `elem` xs)
+oneOf xs = satisfy (`elem` xs)
 {-# INLINE oneOf #-}
 
 -- | As the dual of 'oneOf', @noneOf cs@ succeeds if the current
@@ -82,7 +82,7 @@ oneOf xs = satisfy (\c -> c `elem` xs)
 --
 -- >  consonant = noneOf "aeiou"
 noneOf :: CharParsing m => [Char] -> m Char
-noneOf xs = satisfy (\c -> c `notElem` xs)
+noneOf xs = satisfy (`notElem` xs)
 {-# INLINE noneOf #-}
 
 -- | Skips /zero/ or more white space characters. See also 'skipMany'.

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

@@ -758,8 +758,8 @@ profSharedOptionsFieldGrammar =
 
 lookupLens :: (Functor f, Monoid v) => CompilerFlavor -> LensLike' f (PerCompilerFlavor v) v
 lookupLens k f p@(PerCompilerFlavor ghc ghcjs)
-  | k == GHC = (\n -> PerCompilerFlavor n ghcjs) <$> f ghc
-  | k == GHCJS = (\n -> PerCompilerFlavor ghc n) <$> f ghcjs
+  | k == GHC = (`PerCompilerFlavor` ghcjs) <$> f ghc
+  | k == GHCJS = (ghc `PerCompilerFlavor`) <$> f ghcjs
   | otherwise = p <$ f mempty
 
 -------------------------------------------------------------------------------

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

@@ -133,7 +133,7 @@ data SectionS = SectionS
   }
 
 stateGpd :: Lens' SectionS GenericPackageDescription
-stateGpd f (SectionS gpd cs) = (\x -> SectionS x cs) <$> f gpd
+stateGpd f (SectionS gpd cs) = (`SectionS` cs) <$> f gpd
 {-# INLINE stateGpd #-}
 
 stateCommonStanzas :: Lens' SectionS (Map String CondTreeBuildInfo)

Cabal-syntax/src/Distribution/Parsec/FieldLineStream.hs

@@ -45,7 +45,7 @@ instance Monad m => Parsec.Stream FieldLineStream m Char where
   uncons (FLSCons bs s) = return $ case BS.uncons bs of
     -- as lines are glued with '\n', we return '\n' here!
     Nothing -> Just ('\n', s)
-    Just (c, bs') -> Just (unconsChar c bs' (\bs'' -> FLSCons bs'' s) s)
+    Just (c, bs') -> Just (unconsChar c bs' (`FLSCons` s) s)
 
 unconsChar :: forall a. Word8 -> ByteString -> (ByteString -> a) -> a -> (Char, a)
 unconsChar c0 bs0 f next = go (utf8DecodeStart c0) bs0

Cabal-syntax/src/Distribution/Types/ModuleRenaming.hs

@@ -49,7 +49,7 @@ interpModuleRenaming :: ModuleRenaming -> ModuleName -> Maybe ModuleName
 interpModuleRenaming DefaultRenaming = Just
 interpModuleRenaming (ModuleRenaming rns) =
   let m = Map.fromList rns
-   in \k -> Map.lookup k m
+   in (`Map.lookup` m)
 interpModuleRenaming (HidingRenaming hs) =
   let s = Set.fromList hs
    in \k -> if k `Set.member` s then Nothing else Just k

Cabal-tests/tests/UnitTests/Distribution/Simple/Command.hs

@@ -30,7 +30,7 @@ argumentTests =
     cmdUI = CommandUI
       { commandName = "cmd"
       , commandSynopsis = "the command"
-      , commandUsage = \name -> name ++ " cmd -v[N]"
+      , commandUsage = (++ " cmd -v[N]")
       , commandDescription = Nothing
       , commandNotes = Nothing
       , commandDefaultFlags = Flag.NoFlag

Cabal/src/Distribution/Backpack/LinkedComponent.hs

@@ -381,7 +381,7 @@ toLinkedComponent
         , lc_component = component
         , lc_public = is_public
         , -- These must be executables
-          lc_exe_deps = map (fmap (\cid -> IndefFullUnitId cid Map.empty)) exe_deps
+          lc_exe_deps = map (fmap (`IndefFullUnitId` Map.empty)) exe_deps
         , lc_shape = final_linked_shape
         , lc_includes = linked_includes
         , lc_sig_includes = linked_sig_includes

Cabal/src/Distribution/Simple/Register.hs

@@ -527,7 +527,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
         expectLibraryComponent (maybeComponentExposedModules clbi)
           -- add virtual modules into the list of exposed modules for the
           -- package database as well.
-          ++ map (\name -> IPI.ExposedModule name Nothing) (virtualModules bi)
+          ++ map (`IPI.ExposedModule` Nothing) (virtualModules bi)
     , IPI.hiddenModules = otherModules bi
     , IPI.trusted = IPI.trusted IPI.emptyInstalledPackageInfo
     , IPI.importDirs = [libdir installDirs | hasModules]

Cabal/src/Distribution/Utils/MapAccum.hs

@@ -24,4 +24,4 @@ mapAccumM
   -> a
   -> t b
   -> m (a, t c)
-mapAccumM f s t = runStateM (traverse (\x -> StateM (\s' -> f s' x)) t) s
+mapAccumM f s t = runStateM (traverse (\x -> StateM (`f` x)) t) s