Skip to content

Commit 0c95265

Browse files
committed
Drop Distribution.Compat.CreatePipe
No longer needed with process >= 1.2.1.0.
1 parent 15cd8b5 commit 0c95265

File tree

8 files changed

+4
-148
lines changed

8 files changed

+4
-148
lines changed

Cabal-tests/Cabal-tests.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ test-suite unit-tests
2626
Test.Laws
2727
Test.QuickCheck.Utils
2828
UnitTests.Distribution.CabalSpecVersion
29-
UnitTests.Distribution.Compat.CreatePipe
3029
UnitTests.Distribution.Compat.Graph
3130
UnitTests.Distribution.Compat.Time
3231
UnitTests.Distribution.Described

Cabal-tests/tests/UnitTests.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import Distribution.Simple.Utils
1313
import Distribution.Verbosity
1414
import Distribution.Compat.Time
1515

16-
import qualified UnitTests.Distribution.Compat.CreatePipe
1716
import qualified UnitTests.Distribution.Compat.Time
1817
import qualified UnitTests.Distribution.Compat.Graph
1918
import qualified UnitTests.Distribution.Simple.Command
@@ -44,9 +43,7 @@ tests mtimeChangeCalibrated =
4443
else mtimeChangeCalibrated
4544
in
4645
testGroup "Unit Tests"
47-
[ testGroup "Distribution.Compat.CreatePipe"
48-
UnitTests.Distribution.Compat.CreatePipe.tests
49-
, testGroup "Distribution.Compat.Time"
46+
[ testGroup "Distribution.Compat.Time"
5047
(UnitTests.Distribution.Compat.Time.tests mtimeChange)
5148
, testGroup "Distribution.Compat.Graph"
5249
UnitTests.Distribution.Compat.Graph.tests

Cabal-tests/tests/UnitTests/Distribution/Compat/CreatePipe.hs

Lines changed: 0 additions & 56 deletions
This file was deleted.

Cabal/Cabal.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ library
9696
Distribution.Utils.MD5
9797
Distribution.Utils.String
9898
Distribution.Utils.Structured
99-
Distribution.Compat.CreatePipe
10099
Distribution.Compat.Directory
101100
Distribution.Compat.Environment
102101
Distribution.Compat.Exception

Cabal/src/Distribution/Compat/CreatePipe.hs

Lines changed: 0 additions & 81 deletions
This file was deleted.

Cabal/src/Distribution/Simple/Test/ExeV10.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import Prelude ()
99
import Distribution.Compat.Prelude
1010

1111
import Distribution.Types.UnqualComponentName
12-
import Distribution.Compat.CreatePipe
1312
import Distribution.Compat.Environment
1413
import qualified Distribution.PackageDescription as PD
1514
import Distribution.Simple.Build.PathsModule
@@ -32,6 +31,7 @@ import System.Directory
3231
, getCurrentDirectory, removeDirectoryRecursive )
3332
import System.FilePath ( (</>), (<.>) )
3433
import System.IO ( stdout, stderr )
34+
import System.Process ( createPipe )
3535

3636
import qualified Data.ByteString.Lazy as LBS
3737

Cabal/src/Distribution/Simple/Test/LibV09.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import Prelude ()
1313
import Distribution.Compat.Prelude
1414
import Distribution.Types.UnqualComponentName
1515

16-
import Distribution.Compat.CreatePipe
1716
import Distribution.Compat.Environment
1817
import Distribution.Compat.Internal.TempFile
1918
import Distribution.ModuleName
@@ -42,7 +41,7 @@ import System.Directory
4241
, setCurrentDirectory )
4342
import System.FilePath ( (</>), (<.>) )
4443
import System.IO ( hClose, hPutStr )
45-
import System.Process (StdStream(..), waitForProcess)
44+
import System.Process (StdStream(..), createPipe, waitForProcess)
4645

4746
runTest :: PD.PackageDescription
4847
-> LBI.LocalBuildInfo

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module Test.Cabal.Run (
55
Result(..)
66
) where
77

8-
import qualified Distribution.Compat.CreatePipe as Compat
98
import Distribution.Simple.Program.Run
109
import Distribution.Verbosity
1110

@@ -46,7 +45,7 @@ run _verbosity mb_cwd env_overrides path0 args input = do
4645

4746
mb_env <- getEffectiveEnvironment env_overrides
4847
putStrLn $ "+ " ++ showCommandForUser path args
49-
(readh, writeh) <- Compat.createPipe
48+
(readh, writeh) <- createPipe
5049
hSetBuffering readh LineBuffering
5150
hSetBuffering writeh LineBuffering
5251
let drain = do

0 commit comments

Comments
 (0)