Drop various process <1.2.1.0 compatibility shims

Author: robx

Cabal/src/Distribution/Compat/Process.hs

@@ -11,13 +11,9 @@ module Distribution.Compat.Process (
 import System.Exit (ExitCode (..))
 import System.IO   (Handle)
 
-import           System.Process (CreateProcess, ProcessHandle)
+import           System.Process (CreateProcess, ProcessHandle, waitForProcess)
 import qualified System.Process as Process
 
-#if MIN_VERSION_process(1,2,0)
-import           System.Process (waitForProcess)
-#endif
-
 #if defined(mingw32_HOST_OS) && MIN_VERSION_process(1,6,9)
 import           System.IO.Unsafe (unsafePerformIO)
 import           System.Win32.Info.Version (dwMajorVersion, dwMinorVersion, getVersionEx)
@@ -74,13 +70,8 @@ createProcess = Process.createProcess . enableProcessJobs
 -- See 'enableProcessJobs'.
 rawSystem :: String -> [String] -> IO ExitCode
 rawSystem cmd args = do
-#if MIN_VERSION_process(1,2,0)
   (_,_,_,p) <- createProcess (Process.proc cmd args) { Process.delegate_ctlc = True }
   waitForProcess p
-#else
-  -- With very old 'process', just do its rawSystem
-  Process.rawSystem cmd args
-#endif
 
 -- | 'System.Process.runInteractiveProcess' with process jobs enabled when
 -- appropriate. See 'enableProcessJobs'.

Cabal/src/Distribution/Simple/Utils.hs

@@ -779,13 +779,7 @@ rawSystemExitWithEnv verbosity path args env = withFrozenCallStack $ do
     hFlush stdout
     (_,_,_,ph) <- createProcess $
                   (Process.proc path args) { Process.env = (Just env)
-#ifdef MIN_VERSION_process
-#if MIN_VERSION_process(1,2,0)
--- delegate_ctlc has been added in process 1.2, and we still want to be able to
--- bootstrap GHC on systems not having that version
                                            , Process.delegate_ctlc = True
-#endif
-#endif
                                            }
     exitcode <- waitForProcess ph
     unless (exitcode == ExitSuccess) $ do
@@ -858,13 +852,7 @@ createProcessWithEnv verbosity path args mcwd menv inp out err = withFrozenCallS
                                   , Process.std_in        = inp
                                   , Process.std_out       = out
                                   , Process.std_err       = err
-#ifdef MIN_VERSION_process
-#if MIN_VERSION_process(1,2,0)
--- delegate_ctlc has been added in process 1.2, and we still want to be able to
--- bootstrap GHC on systems not having that version
                                   , Process.delegate_ctlc = True
-#endif
-#endif
                                   }
     return (inp', out', err', ph)
 

cabal-testsuite/main/cabal-tests.hs

@@ -25,13 +25,7 @@ import qualified System.Clock as Clock
 import System.IO
 import System.FilePath
 import System.Exit
-import System.Process (
-#if MIN_VERSION_process(1,2,0)
-    callProcess,
-#else
-    proc, createProcess, waitForProcess, terminateProcess,
-#endif
-    showCommandForUser)
+import System.Process (callProcess, showCommandForUser)
 
 #if !MIN_VERSION_base(4,12,0)
 import Data.Monoid ((<>))
@@ -288,20 +282,3 @@ getTime = do
     t <- Clock.getTime Clock.Monotonic
     let ns = realToFrac $ Clock.toNanoSecs t
     return $ ns / 10 ^ (9 :: Int)
-
--------------------------------------------------------------------------------
--- compat
--------------------------------------------------------------------------------
-
-#if !MIN_VERSION_process(1,2,0)
-callProcess :: FilePath -> [String] -> IO ()
-callProcess cmd args = do
-    exit_code <- bracket (createProcess (proc cmd args)) cleanupProcess
-        $ \(_, _, _, ph) -> waitForProcess ph
-    case exit_code of
-        ExitSuccess   -> return ()
-        ExitFailure r -> fail $ "processFailedException " ++ show (cmd, args, r)
-  where
-    cleanupProcess (_, _, _, ph) = terminateProcess ph
-
-#endif

cabal-testsuite/src/Test/Cabal/Server.hs

@@ -259,15 +259,9 @@ initServer s0 = do
 #else
     pid <- withProcessHandle (serverProcessHandle s0) $ \ph ->
               case ph of
-#if MIN_VERSION_process(1,2,0)
                   OpenHandle x   -> return (show x)
                   -- TODO: handle OpenExtHandle?
                   _              -> return (serverProcessId s0)
-#else
-                  OpenHandle x   -> return (ph, show x)
-                  -- TODO: handle OpenExtHandle?
-                  _              -> return (ph, serverProcessId s0)
-#endif
 #endif
     let s = s0 { serverProcessId = pid }
     -- We will read/write a line at a time, including for