Move Compat.TempFile to Internal.* module and expose from Cabal

This is required for the reworking of integration tests to use shell scripts.
haskell · Oct 11, 2015 · 860148d · 860148d
1 parent b2d7568
commit 860148d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -173,6 +173,7 @@ library
     Distribution.Compat.CreatePipe
     Distribution.Compat.Environment
     Distribution.Compat.Exception
+    Distribution.Compat.Internal.TempFile
     Distribution.Compat.ReadP
     Distribution.Compiler
     Distribution.InstalledPackageInfo
@@ -247,7 +248,6 @@ library
   other-modules:
     Distribution.Compat.Binary
     Distribution.Compat.CopyFile
-    Distribution.Compat.TempFile
     Distribution.GetOpt
     Distribution.Lex
     Distribution.Simple.GHC.Internal

diff --git a/Cabal/Distribution/Compat/CopyFile.hs b/Cabal/Distribution/Compat/CopyFile.hs
@@ -23,7 +23,7 @@ import System.IO.Error
          ( ioeSetLocation )
 import System.Directory
          ( doesFileExist, renameFile, removeFile )
-import Distribution.Compat.TempFile
+import Distribution.Compat.Internal.TempFile
          ( openBinaryTempFile )
 import System.FilePath
          ( takeDirectory )

diff --git a/Cabal/Distribution/Compat/TempFile.hs → .../Distribution/Compat/Internal/TempFile.hs b/Cabal/Distribution/Compat/TempFile.hs → .../Distribution/Compat/Internal/TempFile.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_HADDOCK hide #-}
-module Distribution.Compat.TempFile (
+module Distribution.Compat.Internal.TempFile (
   openTempFile,
   openBinaryTempFile,
   openNewBinaryFile,

diff --git a/Cabal/Distribution/Simple/Test/LibV09.hs b/Cabal/Distribution/Simple/Test/LibV09.hs
@@ -8,7 +8,7 @@ module Distribution.Simple.Test.LibV09
 
 import Distribution.Compat.CreatePipe ( createPipe )
 import Distribution.Compat.Environment ( getEnvironment )
-import Distribution.Compat.TempFile ( openTempFile )
+import Distribution.Compat.Internal.TempFile ( openTempFile )
 import Distribution.ModuleName ( ModuleName )
 import qualified Distribution.PackageDescription as PD
 import Distribution.Simple.Build.PathsModule ( pkgPathEnvVar )

diff --git a/Cabal/Distribution/Simple/Utils.hs b/Cabal/Distribution/Simple/Utils.hs
@@ -203,7 +203,7 @@ import System.Process
 import Distribution.Compat.CopyFile
          ( copyFile, copyOrdinaryFile, copyExecutableFile
          , setFileOrdinary, setFileExecutable, setDirOrdinary )
-import Distribution.Compat.TempFile
+import Distribution.Compat.Internal.TempFile
          ( openTempFile, createTempDirectory )
 import Distribution.Compat.Exception
          ( tryIO, catchIO, catchExit )