decided to move whole instance declaration into Plush.Run.Posix.IO

Author: mzero

src-main/Recho.hs

@@ -20,6 +20,7 @@ import System.Environment
 import System.Exit
 
 import Plush.Run.BuiltIns.Trivial (rechoExec)
+import Plush.Run.Posix.IO ()
 
 main :: IO ()
 main = getArgs >>= rechoExec >>= exitWith

src/Plush/Run.hs

@@ -38,6 +38,7 @@ import qualified Data.Text.Encoding.Error as T
 
 import Plush.Resource
 import Plush.Run.Posix
+import Plush.Run.Posix.IO ()
 import Plush.Run.ShellExec
 import Plush.Run.TestExec
 

src/Plush/Run/Posix.hs

@@ -57,8 +57,6 @@ import System.Posix.IO (stdInput, stdOutput, stdError,
     OpenMode(..), OpenFileFlags(..), defaultFileFlags)
 import System.Posix.Types
 
-import qualified Plush.Run.Posix.IO as IO
-
 
 type Bindings = [(String, String)]
 
@@ -170,48 +168,3 @@ stdJsonInput, stdJsonOutput :: Fd
 stdJsonInput = Fd 3
 stdJsonOutput = Fd 4
 
-
-instance PosixLike IO where
-    createDirectory             = IO.createDirectory
-    removeDirectory             = IO.removeDirectory
-    getDirectoryContents        = IO.getDirectoryContents
-    getWorkingDirectory         = IO.getWorkingDirectory
-    changeWorkingDirectory      = IO.changeWorkingDirectory
-
-    getInitialEnvironment       = IO.getInitialEnvironment
-
-    type FileStatus IO          = IO.FileStatus
-    getFileStatus               = IO.getFileStatus
-    getSymbolicLinkStatus       = IO.getSymbolicLinkStatus
-    isExecutable                = IO.isExecutable
-
-    removeLink                  = IO.removeLink
-    setFileTimes                = IO.setFileTimes
-    touchFile                   = IO.touchFile
-
-    openFd                      = IO.openFd
-    createFile                  = IO.createFile
-    closeFd                     = IO.closeFd
-
-    dupTo                       = IO.dupTo
-    dupFdCloseOnExec            = IO.dupFdCloseOnExec
-    setCloseOnExec              = IO.setCloseOnExec
-
-    readAll                     = IO.readAll
-    write                       = IO.write
-
-    getUserHomeDirectoryForName = IO.getUserHomeDirectoryForName
-    realAndEffectiveIDsMatch    = IO.realAndEffectiveIDsMatch
-    getProcessID                = IO.getProcessID
-
-    execProcess                 = IO.execProcess
-    captureStdout               = IO.captureStdout
-    pipeline                    = IO.pipeline
-    contentFd                   = IO.contentFd
-
-instance PosixLikeFileStatus IO.FileStatus where
-    accessTime                  = IO.accessTime
-    modificationTime            = IO.modificationTime
-    isRegularFile               = IO.isRegularFile
-    isDirectory                 = IO.isDirectory
-    isSymbolicLink              = IO.isSymbolicLink

src/Plush/Run/Posix/IO.hs

@@ -14,58 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -}
 
-{-| This module exports the functions needed to create the instance of PosixIO
-    for IO. The actual instance appears in "Plush.Run.Posix". This module is
-    mostly to just remove clutter from that module.
+{-# Language TypeFamilies #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
-    Note that many of these functions are just re-exports from "System.Posix".
--}
-
-
-module Plush.Run.Posix.IO (
-    P.createDirectory,
-    P.removeDirectory,
-    getDirectoryContents,
-    P.getWorkingDirectory,
-    P.changeWorkingDirectory,
-
-    getInitialEnvironment,
-
-    P.getFileStatus,
-    P.getSymbolicLinkStatus,
-    isExecutable,
-
-    P.removeLink,
-    P.setFileTimes,
-    P.touchFile,
-
-    P.openFd,
-    P.createFile,
-    P.closeFd,
-
-    dupTo,
-    PM.dupFdCloseOnExec,
-    setCloseOnExec,
-
-    readAll,
-    write,
-
-    getUserHomeDirectoryForName,
-    realAndEffectiveIDsMatch,
-    getProcessID,
-
-    execProcess,
-    captureStdout,
-    pipeline,
-    contentFd,
+{-| This module exports the instance of PosixIO for IO. -}
 
-    P.FileStatus,
-    P.accessTime,
-    P.modificationTime,
-    P.isRegularFile,
-    P.isDirectory,
-    P.isSymbolicLink,
-) where
+module Plush.Run.Posix.IO () where
 
 import Control.Applicative ((<$>), (<*>))
 import Control.Concurrent (forkIO)
@@ -85,6 +39,52 @@ import qualified System.IO.Error as IO
 import qualified System.Posix as P
 import qualified System.Posix.Missing as PM
 
+import qualified Plush.Run.Posix as PL
+
+instance PL.PosixLike IO where
+    createDirectory             = P.createDirectory
+    removeDirectory             = P.removeDirectory
+    getDirectoryContents        = getDirectoryContents
+    getWorkingDirectory         = P.getWorkingDirectory
+    changeWorkingDirectory      = P.changeWorkingDirectory
+
+    getInitialEnvironment       = P.getEnvironment
+
+    type FileStatus IO          = P.FileStatus
+    getFileStatus               = P.getFileStatus
+    getSymbolicLinkStatus       = P.getSymbolicLinkStatus
+    isExecutable                = isExecutable
+
+    removeLink                  = P.removeLink
+    setFileTimes                = P.setFileTimes
+    touchFile                   = P.touchFile
+
+    openFd                      = P.openFd
+    createFile                  = P.createFile
+    closeFd                     = P.closeFd
+
+    dupTo                       = dupTo
+    dupFdCloseOnExec            = PM.dupFdCloseOnExec
+    setCloseOnExec              = setCloseOnExec
+
+    readAll                     = readAll
+    write                       = write
+
+    getUserHomeDirectoryForName = getUserHomeDirectoryForName
+    realAndEffectiveIDsMatch    = realAndEffectiveIDsMatch
+    getProcessID                = getProcessID
+
+    execProcess                 = execProcess
+    captureStdout               = captureStdout
+    pipeline                    = pipeline
+    contentFd                   = contentFd
+
+instance PL.PosixLikeFileStatus P.FileStatus where
+    accessTime                  = P.accessTime
+    modificationTime            = P.modificationTime
+    isRegularFile               = P.isRegularFile
+    isDirectory                 = P.isDirectory
+    isSymbolicLink              = P.isSymbolicLink
 
 
 getDirectoryContents :: FilePath -> IO [FilePath]
@@ -101,9 +101,6 @@ getDirectoryContents fp = do
             else readUntilNull ds >>= return . (entry :)
 
 
-getInitialEnvironment :: IO [(String, String)]
-getInitialEnvironment = P.getEnvironment
-
 isExecutable :: FilePath -> IO Bool
 isExecutable path = P.fileAccess path False False True