986cba2 · text · git.iko.soy

Data/Text/IO.hs+5−1

compare with master

unifiedsplit

@@ -38,7 +38,11 @@ module Data.Text.IO

38 ) where

39

40import Data.Text (Text)

41−import Prelude hiding (appendFile, catch, getContents, getLine, interact,

41+import Prelude hiding (appendFile,

42+#if !MIN_VERSION_base(4,6,0)

43+ catch,

44+#endif

45+ getContents, getLine, interact,

42 putStr, putStrLn, readFile, writeFile)

46 putStr, putStrLn, readFile, writeFile)

43import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

47import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

44 withFile)

48 withFile)

Data/Text/IO/Internal.hs+2

@@ -32,7 +32,9 @@ import GHC.IO.Buffer (Buffer(..), CharBuffer, RawCharBuffer, bufferAdjustL,

32 withRawBuffer, writeCharBuf)

33import GHC.IO.Handle.Internals (ioe_EOF, readTextDevice, wantReadableHandle_)

34import GHC.IO.Handle.Types (Handle__(..), Newline(..))

35+#if !MIN_VERSION_base(4,6,0)

35import Prelude hiding (catch)

36import Prelude hiding (catch)

37+#endif

36import System.IO (Handle)

38import System.IO (Handle)

37import System.IO.Error (isEOFError)

39import System.IO.Error (isEOFError)

38import qualified Data.Text as T

40import qualified Data.Text as T

Data/Text/Lazy/IO.hs+5−1

@@ -38,7 +38,11 @@ module Data.Text.Lazy.IO

38 ) where

39

40import Data.Text.Lazy (Text)

41−import Prelude hiding (appendFile, catch, getContents, getLine, interact,

41+import Prelude hiding (appendFile,

42+#if !MIN_VERSION_base(4,6,0)

43+ catch,

44+#endif

45+ getContents, getLine, interact,

42 putStr, putStrLn, readFile, writeFile)

46 putStr, putStrLn, readFile, writeFile)

43import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

47import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

44 withFile)

48 withFile)

tests/tests/src/Data/Text/Tests/Properties.hs+5−1

@@ -26,7 +26,11 @@ import Data.Text.Read as T

26import Data.Text.Search (indices)

27import Data.Word (Word8, Word16, Word32)

28import Numeric (showHex)

29−import Prelude hiding (catch, replicate)

29+import Prelude hiding (

30+#if !MIN_VERSION_base(4,6,0)

31+ catch,

32+#endif

33+ replicate)

30import Test.Framework (Test, testGroup)

34import Test.Framework (Test, testGroup)

31import Test.Framework.Providers.QuickCheck2 (testProperty)

35import Test.Framework.Providers.QuickCheck2 (testProperty)

32import qualified Data.Bits as Bits (shiftL, shiftR)

36import qualified Data.Bits as Bits (shiftL, shiftR)