screened 2024-06-03 08:38:56+00:00

bfrk · Jun 3, 2024 · 6f54090 · 6f54090
1 parent e81a306
commit 6f54090
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 31 deletions.
diff --git a/shelly/src/Shelly.hs b/shelly/src/Shelly.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
-             FlexibleInstances, IncoherentInstances,
+             FlexibleInstances, IncoherentInstances, CPP,
              TypeFamilies, ExistentialQuantification #-}
 
 -- | A module for shell-like programming in Haskell.
@@ -98,11 +98,7 @@ import Shelly.Find
 import Control.Monad ( when, unless, void, forM, filterM, liftM2 )
 import Control.Monad.Trans ( MonadIO )
 import Control.Monad.Reader (ask)
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding ( readFile, FilePath, catch)
-#else
 import Prelude hiding ( readFile, FilePath)
-#endif
 import Data.Char ( isAlphaNum, isSpace )
 import Data.Typeable
 import Data.IORef
@@ -312,7 +308,7 @@ runCommand handles st exe args = findExe exe >>= \fullExe ->
   where
     findExe :: FilePath -> Sh FilePath
     findExe
-#if defined(mingw32_HOST_OS) || (defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 708)
+#if defined(mingw32_HOST_OS)
       fp
 #else
       _fp
@@ -327,7 +323,7 @@ runCommand handles st exe args = findExe exe >>= \fullExe ->
           -- non-Windows < 7.8 has a bug for read-only file systems
           -- https://github.com/yesodweb/Shelly.hs/issues/56
           -- it would be better to specifically detect that bug
-#if defined(mingw32_HOST_OS) || (defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 708)
+#if defined(mingw32_HOST_OS)
           Left _ -> return fp
 #else
           Left err -> liftIO $ throwIO $ userError err

diff --git a/shelly/src/Shelly/Base.hs b/shelly/src/Shelly/Base.hs
@@ -31,11 +31,7 @@ module Shelly.Base
     , addTrailingSlash
   ) where
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding (FilePath, catch)
-#else
 import Prelude hiding (FilePath)
-#endif
 
 import Data.Text (Text)
 import System.Process( StdStream(..) )

diff --git a/shelly/test/src/CopySpec.hs b/shelly/test/src/CopySpec.hs
@@ -1,13 +1,8 @@
-{-# Language CPP #-}
 module CopySpec ( copySpec ) where
 
 import TestInit
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding ( FilePath, catch)
-#else
 import Prelude hiding ( FilePath)
-#endif
 import Control.Monad (forM_)
 import System.IO.Error
 import Help

diff --git a/shelly/test/src/EnvSpec.hs b/shelly/test/src/EnvSpec.hs
@@ -1,12 +1,7 @@
-{-# LANGUAGE CPP #-}
 module EnvSpec ( envSpec ) where
 
 import TestInit
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding ( FilePath, catch)
-#else
 import Prelude hiding ( FilePath)
-#endif
 import Data.Maybe
 
 envSpec :: Spec

diff --git a/shelly/test/src/Help.hs b/shelly/test/src/Help.hs
@@ -4,11 +4,7 @@ module Help (
 ) where
 
 import Shelly
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding ( catch, FilePath )
-#else
 import Prelude hiding ( FilePath )
-#endif
 import Test.HUnit
 import Control.Monad.Trans ( MonadIO )
 

diff --git a/shelly/test/src/ReadFileSpec.hs b/shelly/test/src/ReadFileSpec.hs
@@ -1,13 +1,7 @@
-{-# LANGUAGE CPP #-}
-
 module ReadFileSpec (readFileSpec) where
 
 import TestInit
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 706
-import Prelude hiding ( FilePath, catch)
-#else
 import Prelude hiding ( FilePath)
-#endif
 import qualified Data.ByteString as BS
 import qualified Data.Text as T