Merge pull request #5883 from Vlix/import-data-list-qualified

import `Data.List` qualified as "-Wcompat-unqualified-imports" says

Author: mpilgrem

src/Path/Find.hs

@@ -12,7 +12,7 @@ module Path.Find
 
 import RIO
 import System.IO.Error (isPermissionError)
-import Data.List
+import qualified Data.List as L
 import Path
 import Path.IO hiding (findFiles)
 import System.PosixCompat.Files (getSymbolicLinkStatus, isSymbolicLink)
@@ -43,7 +43,7 @@ findPathUp :: (MonadIO m,MonadThrow m)
            -> m (Maybe (Path Abs t))           -- ^ Absolute path.
 findPathUp pathType dir p upperBound =
   do entries <- listDir dir
-     case find p (pathType entries) of
+     case L.find p (pathType entries) of
        Just path -> pure (Just path)
        Nothing | Just dir == upperBound -> pure Nothing
                | parent dir == dir -> pure Nothing

src/Stack/Build/ConstructPlan.hs

@@ -17,7 +17,7 @@ module Stack.Build.ConstructPlan
 import           Stack.Prelude hiding (Display (..), loadPackage)
 import           Control.Monad.RWS.Strict hiding ((<>))
 import           Control.Monad.State.Strict (execState)
-import           Data.List
+import qualified Data.List as L
 import qualified Data.Map.Strict as M
 import qualified Data.Map.Strict as Map
 import           Data.Monoid.Map (MonoidMap(..))
@@ -285,12 +285,12 @@ instance Show NotOnlyLocal where
     [ "Specified only-locals, but I need to build snapshot contents:\n"
     , if null packages then "" else concat
         [ "Packages: "
-        , intercalate ", " (map packageNameString packages)
+        , L.intercalate ", " (map packageNameString packages)
         , "\n"
         ]
     , if null exes then "" else concat
         [ "Executables: "
-        , intercalate ", " (map T.unpack exes)
+        , L.intercalate ", " (map T.unpack exes)
         , "\n"
         ]
     ]
@@ -1037,7 +1037,7 @@ pprintExceptions exceptions stackYaml stackRoot parentMap wanted' prunedGlobalDe
     mconcat $
       [ flow "While constructing the build plan, the following exceptions were encountered:"
       , line <> line
-      , mconcat (intersperse (line <> line) (mapMaybe pprintException exceptions'))
+      , mconcat (L.intersperse (line <> line) (mapMaybe pprintException exceptions'))
       , line <> line
       , flow "Some different approaches to resolving this:"
       , line <> line
@@ -1173,7 +1173,7 @@ pprintExceptions exceptions stackYaml stackRoot parentMap wanted' prunedGlobalDe
             align (flow "is a library dependency, but the package provides no library")
         BDDependencyCycleDetected names -> Just $
             style Error (fromString $ packageNameString name) <+>
-            align (flow $ "dependency cycle detected: " ++ intercalate ", " (map packageNameString names))
+            align (flow $ "dependency cycle detected: " ++ L.intercalate ", " (map packageNameString names))
       where
         goodRange = style Good (fromString (Cabal.display range))
         latestApplicable mversion =
@@ -1215,9 +1215,9 @@ getShortestDepsPath (MonoidMap parentsMap) wanted' name =
     findShortest fuel paths =
         case targets of
             [] -> findShortest (fuel - 1) $ M.fromListWith chooseBest $ concatMap extendPath recurses
-            _ -> let (DepsPath _ _ path) = minimum (map snd targets) in path
+            _ -> let (DepsPath _ _ path) = L.minimum (map snd targets) in path
       where
-        (targets, recurses) = partition (\(n, _) -> n `Set.member` wanted') (M.toList paths)
+        (targets, recurses) = L.partition (\(n, _) -> n `Set.member` wanted') (M.toList paths)
     chooseBest :: DepsPath -> DepsPath -> DepsPath
     chooseBest x y = max x y
     -- Extend a path to all its parents.

src/Stack/Build/Execute.hs

@@ -40,7 +40,7 @@ import qualified Data.Conduit.Filesystem as CF
 import qualified Data.Conduit.List as CL
 import           Data.Conduit.Process.Typed (createSource)
 import qualified Data.Conduit.Text as CT
-import           Data.List hiding (any)
+import qualified Data.List as L
 import           Data.List.NonEmpty (nonEmpty)
 import qualified Data.List.NonEmpty as NonEmpty (toList)
 import           Data.List.Split (chunksOf)
@@ -110,7 +110,7 @@ preFetch plan
     | otherwise = do
         logDebug $
             "Prefetching: " <>
-            mconcat (intersperse ", " (RIO.display <$> Set.toList pkgLocs))
+            mconcat (L.intersperse ", " (RIO.display <$> Set.toList pkgLocs))
         fetchPackages pkgLocs
   where
     pkgLocs = Set.unions $ map toPkgLoc $ Map.elems $ planTasks plan
@@ -184,7 +184,7 @@ displayTask task =
     (if Set.null missing
         then ""
         else ", after: " <>
-             mconcat (intersperse "," (fromString . packageIdentifierString <$> Set.toList missing)))
+             mconcat (L.intersperse "," (fromString . packageIdentifierString <$> Set.toList missing)))
   where
     missing = tcoMissing $ taskConfigOpts task
 
@@ -626,7 +626,7 @@ executePlan' installedMap0 targets plan ee@ExecuteEnv {..} = do
                     let packageNames = map (\(ActionId pkgID _) -> pkgName pkgID) (toList inProgress)
                         nowBuilding :: [PackageName] -> Utf8Builder
                         nowBuilding []    = ""
-                        nowBuilding names = mconcat $ ": " : intersperse ", " (map (fromString . packageNameString) names)
+                        nowBuilding names = mconcat $ ": " : L.intersperse ", " (map (fromString . packageNameString) names)
                     when terminal $ run $
                         logSticky $
                             "Progress " <> RIO.display prev <> "/" <> RIO.display total <>
@@ -974,7 +974,7 @@ packageNamePrefix ee name' =
       paddedName =
         case eeLargestPackageName ee of
           Nothing -> name
-          Just len -> assert (len >= length name) $ RIO.take len $ name ++ repeat ' '
+          Just len -> assert (len >= length name) $ RIO.take len $ name ++ L.repeat ' '
    in fromString paddedName <> "> "
 
 announceTask :: HasLogFunc env => ExecuteEnv -> Task -> Utf8Builder -> RIO env ()
@@ -1608,12 +1608,12 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap
                       "- In" <+>
                       fromString (T.unpack (renderComponent comp)) <>
                       ":" <> line <>
-                      indent 4 (mconcat $ intersperse line $ map (style Good . fromString . C.display) modules)
+                      indent 4 (mconcat $ L.intersperse line $ map (style Good . fromString . C.display) modules)
                 forM_ mlocalWarnings $ \(cabalfp, warnings) -> do
                     unless (null warnings) $ prettyWarn $
                         "The following modules should be added to exposed-modules or other-modules in" <+>
                         pretty cabalfp <> ":" <> line <>
-                        indent 4 (mconcat $ intersperse line $ map showModuleWarning warnings) <>
+                        indent 4 (mconcat $ L.intersperse line $ map showModuleWarning warnings) <>
                         line <> line <>
                         "Missing modules in the cabal file are likely to cause undefined reference errors from the linker, along with other problems."
 
@@ -1705,12 +1705,12 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} installedMap
 
             runConduitRes
               $ CF.sourceDirectoryDeep False (toFilePath distDir)
-             .| CL.filter (isInfixOf ".dump-")
+             .| CL.filter (L.isInfixOf ".dump-")
              .| CL.mapM_ (\src -> liftIO $ do
                   parentDir <- parent <$> parseRelDir src
                   destBaseDir <- (ddumpDir </>) <$> stripProperPrefix distDir parentDir
                   -- exclude .stack-work dir
-                  unless (".stack-work" `isInfixOf` toFilePath destBaseDir) $ do
+                  unless (".stack-work" `L.isInfixOf` toFilePath destBaseDir) $ do
                     ensureDir destBaseDir
                     src' <- parseRelFile src
                     copyFile src' (destBaseDir </> filename src'))
@@ -1919,7 +1919,7 @@ singleTest topts testsToRun ac ee task installedMap = do
                                        Just (Library _ ghcPkgId _) -> [ghcPkgId]
                                        _ -> []
                 -- doctest relies on template-haskell in QuickCheck-based tests
-                thGhcId <- case find ((== "template-haskell") . pkgName . dpPackageIdent. snd)
+                thGhcId <- case L.find ((== "template-haskell") . pkgName . dpPackageIdent. snd)
                                 (Map.toList $ eeGlobalDumpPkgs ee) of
                   Just (ghcId, _) -> pure ghcId
                   Nothing -> error "template-haskell is a wired-in GHC boot library but it wasn't found"

src/Stack/Build/Installed.hs

@@ -16,7 +16,6 @@ module Stack.Build.Installed
 import           Data.Conduit
 import qualified Data.Conduit.List as CL
 import qualified Data.Set as Set
-import           Data.List
 import qualified Data.Map.Strict as Map
 import           Path
 import           Stack.Build.Cache

src/Stack/Build/Source.hs

@@ -23,7 +23,7 @@ import qualified    Pantry.SHA256 as SHA256
 import              Data.ByteString.Builder (toLazyByteString)
 import              Conduit (ZipSink (..), withSourceFile)
 import qualified    Distribution.PackageDescription as C
-import              Data.List
+import qualified    Data.List as L
 import qualified    Data.Map as Map
 import qualified    Data.Map.Strict as M
 import qualified    Data.Set as Set
@@ -363,7 +363,7 @@ loadLocalPackage pp = do
           pure $
             if not (Set.null allDirtyFiles)
                 then let tryStripPrefix y =
-                          fromMaybe y (stripPrefix (toFilePath $ ppRoot pp) y)
+                          fromMaybe y (L.stripPrefix (toFilePath $ ppRoot pp) y)
                       in Just $ Set.map tryStripPrefix allDirtyFiles
                 else Nothing
         newBuildCaches =

src/Stack/Coverage.hs

@@ -21,7 +21,7 @@ module Stack.Coverage
 import           Stack.Prelude hiding (Display (..))
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as BL
-import           Data.List
+import qualified Data.List as L
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Data.Text as T
@@ -141,8 +141,9 @@ generateHpcReport pkgDir package tests = do
             -- #634 - this will likely be customizable in the future)
             Right mincludeName -> do
                 let extraArgs = case mincludeName of
-                        Just includeNames -> "--include" : intersperse "--include" (map (\n -> n ++ ":") includeNames)
                         Nothing -> []
+                        Just includeNames ->
+                            "--include" : L.intersperse "--include" (map (\n -> n ++ ":") includeNames)
                 mreportPath <- generateHpcReportInternal tixSrc reportDir report extraArgs extraArgs
                 forM_ mreportPath (displayReportPath "The" report . pretty)
 
@@ -254,7 +255,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do
                                  (dirs, _) <- listDir pkgPath
                                  liftM concat $ forM dirs $ \dir -> do
                                      (_, files) <- listDir dir
-                                     pure (filter ((".tix" `isSuffixOf`) . toFilePath) files)
+                                     pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
                              else pure []
     tixPaths <- liftM (\xs -> xs ++ targetTixFiles) $ mapM (resolveFile' . T.unpack) tixFiles
     when (null tixPaths) $
@@ -284,7 +285,7 @@ generateHpcUnifiedReport = do
         (dirs', _) <- listDir dir
         forM dirs' $ \dir' -> do
             (_, files) <- listDir dir'
-            pure (filter ((".tix" `isSuffixOf`) . toFilePath) files)
+            pure (filter ((".tix" `L.isSuffixOf`) . toFilePath) files)
     extraTixFiles <- findExtraTixFiles
     let tixFiles = tixFiles0  ++ extraTixFiles
         reportDir = outputDir </> relDirCombined </> relDirAll
@@ -324,7 +325,7 @@ generateUnionReport report reportDir tixFiles = do
         "The following modules are left out of the " <>
         RIO.display report <>
         " due to version mismatches: " <>
-        mconcat (intersperse ", " (map fromString errs))
+        mconcat (L.intersperse ", " (map fromString errs))
     tixDest <- liftM (reportDir </>) $ parseRelFile (dirnameString reportDir ++ ".tix")
     ensureDir (parent tixDest)
     liftIO $ writeTix (toFilePath tixDest) tix
@@ -435,7 +436,7 @@ sanitize :: String -> Text
 sanitize = LT.toStrict . htmlEscape . LT.pack
 
 dirnameString :: Path r Dir -> String
-dirnameString = dropWhileEnd isPathSeparator . toFilePath . dirname
+dirnameString = L.dropWhileEnd isPathSeparator . toFilePath . dirname
 
 findPackageFieldForBuiltPackage
     :: HasEnvConfig env
@@ -506,5 +507,5 @@ findExtraTixFiles = do
     if dirExists
         then do
             (_, files) <- listDir dir
-            pure $ filter ((".tix" `isSuffixOf`) . toFilePath) files
+            pure $ filter ((".tix" `L.isSuffixOf`) . toFilePath) files
         else pure []

src/Stack/GhcPkg.hs

@@ -17,7 +17,7 @@ module Stack.GhcPkg
 import           Stack.Prelude
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as BL
-import           Data.List
+import qualified Data.List as L
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import           Path (parent, (</>))
@@ -152,7 +152,7 @@ unregisterGhcPkgIds pkgexe pkgDb epgids = do
 -- | Get the value for GHC_PACKAGE_PATH
 mkGhcPackagePath :: Bool -> Path Abs Dir -> Path Abs Dir -> [Path Abs Dir] -> Path Abs Dir -> Text
 mkGhcPackagePath locals localdb deps extras globaldb =
-  T.pack $ intercalate [searchPathSeparator] $ concat
+  T.pack $ L.intercalate [searchPathSeparator] $ concat
     [ [toFilePathNoTrailingSep localdb | locals]
     , [toFilePathNoTrailingSep deps]
     , [toFilePathNoTrailingSep db | db <- reverse extras]