Deprecate obsolete functions

Author: robx

Cabal/src/Distribution/Compat/Process.hs

@@ -1,12 +1,13 @@
 {-# LANGUAGE CPP #-}
 module Distribution.Compat.Process (
     -- * Redefined functions
-    createProcess,
     proc,
-    runInteractiveProcess,
-    rawSystem,
     -- * Additions
     enableProcessJobs,
+    -- * Deprecated
+    createProcess,
+    runInteractiveProcess,
+    rawSystem,
     ) where
 
 import System.Exit (ExitCode (..))
@@ -68,19 +69,22 @@ proc path args = enableProcessJobs (Process.proc path args) { Process.delegate_c
 
 -- | 'System.Process.createProcess' with process jobs enabled when appropriate.
 -- See 'enableProcessJobs'.
+{-# DEPRECATED createProcess "use proc with System.Process.createProcess instead" #-}
 createProcess :: CreateProcess
               -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
 createProcess = Process.createProcess . enableProcessJobs
 
 -- | 'System.Process.rawSystem' with process jobs enabled when appropriate.
 -- See 'enableProcessJobs'.
+{-# DEPRECATED rawSystem "use one of the functions exported by Distribution.Simple.Utils instead" #-}
 rawSystem :: FilePath -> [String] -> IO ExitCode
 rawSystem path args = do
   (_,_,_,p) <- Process.createProcess (proc path args)
   Process.waitForProcess p
 
 -- | 'System.Process.runInteractiveProcess' with process jobs enabled when
 -- appropriate. See 'enableProcessJobs'.
+{-# DEPRECATED runInteractiveProcess "use one of the functions exported by Distribution.Simple.Utils instead" #-}
 runInteractiveProcess
   :: FilePath                   -- ^ Filename of the executable (see 'RawCommand' for details)
   -> [String]                   -- ^ Arguments to pass to the executable

Cabal/src/Distribution/Simple/Utils.hs

@@ -38,7 +38,7 @@ module Distribution.Simple.Utils (
         debug, debugNoWrap,
         chattyTry,
         annotateIO,
-        printRawCommandAndArgs, printRawCommandAndArgsAndEnv,
+        logCommand,
         withOutputMarker,
 
         -- * exceptions
@@ -55,7 +55,6 @@ module Distribution.Simple.Utils (
         rawSystemStdInOut,
         rawSystemIOWithEnv,
         rawSystemIOWithEnvAndAction,
-        createProcessWithEnv,
         fromCreatePipe,
         maybeExit,
         xargs,
@@ -175,6 +174,10 @@ module Distribution.Simple.Utils (
         -- * FilePath stuff
         isAbsoluteOnAnyPlatform,
         isRelativeOnAnyPlatform,
+
+        -- * Deprecated
+        printRawCommandAndArgs, printRawCommandAndArgsAndEnv,
+        createProcessWithEnv,
   ) where
 
 import Prelude ()
@@ -735,10 +738,12 @@ maybeExit cmd = do
   exitcode <- cmd
   unless (exitcode == ExitSuccess) $ exitWith exitcode
 
+{-# DEPRECATED printRawCommandAndArgs "use logCommand" #-}
 printRawCommandAndArgs :: Verbosity -> FilePath -> [String] -> IO ()
 printRawCommandAndArgs verbosity path args = withFrozenCallStack $ do
     logCommand verbosity (proc path args)
 
+{-# DEPRECATED printRawCommandAndArgsAndEnv "use logCommand" #-}
 printRawCommandAndArgsAndEnv :: Verbosity
                              -> FilePath
                              -> [String]
@@ -888,6 +893,7 @@ rawSystemIOWithEnvAndAction verbosity path args mcwd menv action inp out err = w
     mbToStd :: Maybe Handle -> Process.StdStream
     mbToStd = maybe Process.Inherit Process.UseHandle
 
+{-# DEPRECATED createProcessWithEnv "use System.Process.createProcess with Distribution.Compat.Process.proc instead" #-}
 createProcessWithEnv ::
      Verbosity
   -> FilePath

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

@@ -226,7 +226,6 @@ startServer chan senv = do
                         std_out = CreatePipe,
                         std_err = CreatePipe
                     }
-    -- printRawCommandAndArgsAndEnv (runnerVerbosity senv) (programPath prog) ghc_args Nothing
     when (verbosity >= verbose) $
         writeChan chan (ServerLogMsg AllServers (showCommandForUser (programPath prog) ghc_args))
     (Just hin, Just hout, Just herr, proch) <- createProcess proc_spec