Merge pull request #11407 from haskell/clean-up-compatibility-shims-for-directory

Clean up compatibility shims for `directory` package

Author: mergify[bot]

Cabal-tests/Cabal-tests.cabal

@@ -63,7 +63,7 @@ test-suite unit-tests
     , Cabal-QuickCheck
     , containers
     , Diff                >=0.4   && <0.6
-    , directory
+    , directory           >=1.2.7
     , filepath
     , pretty
     , QuickCheck          >=2.14  && <2.15

Cabal-tests/lib/Test/Utils/TempTestDir.hs

@@ -91,29 +91,3 @@ removeDirectoryRecursiveHack verbosity dir | isWindows = go 1
                 ++ " times to remove "
                 ++ dir
 removeDirectoryRecursiveHack _ dir = removeDirectoryRecursive dir
-
-#if !(MIN_VERSION_directory(1,2,7))
--- A simplified version that ought to work for our use case here, and does
--- not rely on directory internals.
-removePathForcibly :: FilePath -> IO ()
-removePathForcibly path = do
-    makeRemovable path `catchIOError` \ _ -> pure ()
-    isDir <- doesDirectoryExist path
-    if isDir
-       then do
-         entries <- getDirectoryContents path
-         sequence_
-           [ removePathForcibly (path </> entry)
-           | entry <- entries, entry /= ".", entry /= ".." ]
-         removeDirectory path
-       else
-         removeFile path
-  where
-    makeRemovable :: FilePath -> IO ()
-    makeRemovable p =
-      setPermissions p emptyPermissions {
-        readable   = True,
-        searchable = True,
-        writable   = True
-      }
-#endif

Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs

@@ -182,21 +182,8 @@ import Distribution.Types.LibraryName
        (libraryNameString)
 #endif
 
-#if MIN_VERSION_directory(1,2,2)
 import System.Directory
        (makeAbsolute)
-#else
-import System.Directory
-       (getCurrentDirectory)
-import System.FilePath
-       (isAbsolute)
-
-makeAbsolute :: FilePath -> IO FilePath
-makeAbsolute p | isAbsolute p = return p
-               | otherwise    = do
-    cwd <- getCurrentDirectory
-    return $ cwd </> p
-#endif
 
 findFile' :: Verbosity -> [FilePath] -> FilePath -> IO FilePath
 #if MIN_VERSION_Cabal(3,11,0)

Cabal/Cabal.cabal

@@ -45,7 +45,7 @@ library
     , bytestring >= 0.10.0.0 && < 0.13
     , containers >= 0.5.8.2  && < 0.9
     , deepseq    >= 1.3.0.1  && < 1.7
-    , directory  >= 1.2      && < 1.4
+    , directory  >= 1.2.7    && < 1.4
     , filepath   >= 1.3.0.1  && < 1.6
     , pretty     >= 1.1.1    && < 1.2
     , process    >= 1.2.1.0  && < 1.7
@@ -94,7 +94,6 @@ library
     Distribution.Utils.LogProgress
     Distribution.Utils.MapAccum
     Distribution.Compat.CreatePipe
-    Distribution.Compat.Directory
     Distribution.Compat.Environment
     Distribution.Compat.FilePath
     Distribution.Compat.Internal.TempFile

Cabal/src/Distribution/Compat/Directory.hs

@@ -137,10 +137,6 @@ import Data.List
   )
 import qualified Data.List.NonEmpty as NEL
 import qualified Data.Map as Map
-import Distribution.Compat.Directory
-  ( doesPathExist
-  , listDirectory
-  )
 import Distribution.Compat.Environment (lookupEnv)
 import Distribution.Parsec
   ( simpleParsec
@@ -158,6 +154,8 @@ import System.Directory
   ( canonicalizePath
   , createDirectoryIfMissing
   , doesFileExist
+  , doesPathExist
+  , listDirectory
   , removeFile
   )
 import System.FilePath

Cabal/src/Distribution/Simple/Configure.hs

@@ -37,12 +37,11 @@ import Distribution.Utils.NubList
 import Distribution.Utils.Path
 
 -- Base
-import System.Directory (createDirectoryIfMissing, doesFileExist)
+import System.Directory (createDirectoryIfMissing, doesFileExist, makeAbsolute)
 import qualified System.FilePath as FilePath
 #ifdef mingw32_HOST_OS
 import System.FilePath    (normalise, splitDrive)
 #endif
-import Distribution.Compat.Directory (makeAbsolute)
 import Distribution.Compat.Environment (getEnvironment)
 import Distribution.Compat.GetShortPathName (getShortPathName)
 

Cabal/src/Distribution/Simple/ConfigureScript.hs

@@ -46,7 +46,7 @@ import Distribution.Simple.Utils
 import Distribution.System
 import Distribution.Verbosity
 
-import qualified System.Directory as Directory
+import System.Directory
   ( findExecutable
   )
 import System.FilePath as FilePath
@@ -206,29 +206,6 @@ getSystemSearchPath = fmap nub $ do
     FilePath.getSearchPath
 #endif
 
-#ifdef MIN_VERSION_directory
-#if MIN_VERSION_directory(1,2,1)
-#define HAVE_directory_121
-#endif
-#endif
-
-findExecutable :: FilePath -> IO (Maybe FilePath)
-#ifdef HAVE_directory_121
-findExecutable = Directory.findExecutable
-#else
-findExecutable prog = do
-      -- With directory < 1.2.1 'findExecutable' doesn't check that the path
-      -- really refers to an executable.
-      mExe <- Directory.findExecutable prog
-      case mExe of
-        Just exe -> do
-          exeExists <- doesExecutableExist exe
-          if exeExists
-            then return mExe
-            else return Nothing
-        _     -> return mExe
-#endif
-
 -- | Make a simple named program.
 --
 -- By default we'll just search for it in the path and not try to find the

Cabal/src/Distribution/Simple/Program/Find.hs

@@ -127,7 +127,6 @@ library
         Distribution.Client.CmdTest
         Distribution.Client.CmdUpdate
         Distribution.Client.CmdGenBounds
-        Distribution.Client.Compat.Directory
         Distribution.Client.Compat.Orphans
         Distribution.Client.Compat.Prelude
         Distribution.Client.Compat.Semaphore
@@ -448,9 +447,6 @@ test-suite integration-tests2
   hs-source-dirs: tests
   default-language: Haskell2010
 
-  other-modules:
-    IntegrationTests2.CPP
-
   build-depends:
     , bytestring
     , cabal-install

cabal-install/cabal-install.cabal

@@ -21,9 +21,6 @@ module Distribution.Client.CmdInstall
   ) where
 
 import Distribution.Client.Compat.Prelude
-import Distribution.Compat.Directory
-  ( doesPathExist
-  )
 import Prelude ()
 
 import Distribution.Client.CmdErrorMessages
@@ -238,6 +235,7 @@ import System.Directory
   , createDirectoryIfMissing
   , doesDirectoryExist
   , doesFileExist
+  , doesPathExist
   , getTemporaryDirectory
   , makeAbsolute
   , removeDirectory