Merge branch 'cabal-init-rewrite' of https://github.com/ptkato/cabal into cabal-init-rewrite

Author: ptkato

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

@@ -428,19 +428,19 @@ listContents dir = do
 -- | From Control.Monad.Extra
 --   https://hackage.haskell.org/package/extra-1.7.9
 ifM :: Monad m => m Bool -> m a -> m a -> m a
-ifM b t f = do b <- b; if b then t else f
+ifM b t f = do b' <- b; if b' then t else f
 
 -- | From Control.Monad.Extra
 --   https://hackage.haskell.org/package/extra-1.7.9
 concatMapM :: Monad m => (a -> m [b]) -> [a] -> m [b]
 {-# INLINE concatMapM #-}
 concatMapM op = foldr f (pure [])
-    where f x xs = do x <- op x; if null x then xs else do xs <- xs; pure $ x++xs
+    where f x xs = do x' <- op x; if null x' then xs else do xs' <- xs; pure $ x' ++ xs'
 
 -- | From Control.Monad.Extra
 --   https://hackage.haskell.org/package/extra-1.7.9
 partitionM :: Monad m => (a -> m Bool) -> [a] -> m ([a], [a])
-partitionM f [] = pure ([], [])
+partitionM _ [] = pure ([], [])
 partitionM f (x:xs) = do
     res <- f x
     (as,bs) <- partitionM f xs