diff --git a/benchmarks/Benchmark.hs b/benchmarks/Benchmark.hs index dfaa27f..4a5cba7 100644 --- a/benchmarks/Benchmark.hs +++ b/benchmarks/Benchmark.hs @@ -5,6 +5,7 @@ import qualified Data.ByteString.Lazy as L import Data.Binary import Data.Binary.Put import Data.Binary.Get +import Data.Word import Control.Exception import System.CPUTime diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs index 2ee5d21..2e0be9f 100644 --- a/benchmarks/Get.hs +++ b/benchmarks/Get.hs @@ -7,6 +7,7 @@ import qualified Data.ByteString.Lazy as L import Data.Bits import Data.Char (ord) import Data.List (foldl') +import Data.Word import Test.Tasty.Bench import Control.Applicative diff --git a/benchmarks/Put.hs b/benchmarks/Put.hs index 4ba3366..4d83ee5 100644 --- a/benchmarks/Put.hs +++ b/benchmarks/Put.hs @@ -5,7 +5,7 @@ import Control.Exception (evaluate) import qualified Data.ByteString as S import qualified Data.ByteString.Char8 as C import qualified Data.ByteString.Lazy as L -import Data.Monoid +import Data.Word import Test.Tasty.Bench import GHC.Generics @@ -13,7 +13,6 @@ import GHC.Generics import Data.Binary import Data.Binary.Put import Data.ByteString.Builder as BB -import Prelude -- Silence Monoid import warning. main :: IO () main = do diff --git a/changelog.md b/changelog.md index 13d4191..0c2dcc2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,11 @@ binary ====== +binary-0.9.0.0 +-------------- + +- Don't reexport `Data.Word` from `Data.Binary` + binary-0.8.9.2 -------------- @@ -170,7 +175,7 @@ binary-0.7.1.0 -------------- - Add `lookAheadE :: Get (Either a b) -> Get (Either a b)`. -- Add MonadPlus instance for Get. +- Add MonadPlus instance for Get. binary-0.7.0.1 diff --git a/src/Data/Binary.hs b/src/Data/Binary.hs index 07970a3..7139805 100644 --- a/src/Data/Binary.hs +++ b/src/Data/Binary.hs @@ -67,12 +67,8 @@ module Data.Binary ( , decodeFile -- :: Binary a => FilePath -> IO a , decodeFileOrFail - , module Data.Word -- useful - ) where -import Data.Word - import Data.Binary.Class import Data.Binary.Put import Data.Binary.Get diff --git a/tests/File.hs b/tests/File.hs index 1ec631b..02a26df 100644 --- a/tests/File.hs +++ b/tests/File.hs @@ -13,6 +13,7 @@ import Distribution.Simple.Utils (withTempDirectory) import Distribution.Verbosity (silent) import Data.Binary +import Data.Word data Foo = Bar !Word32 !Word32 !Word32 deriving (Eq, Show) @@ -38,6 +39,6 @@ readWriteTest = TestCase $ do exampleData @=? content main :: IO () -main = do +main = do _ <- runTestTT readWriteTest - return () \ No newline at end of file + return () diff --git a/tests/QC.hs b/tests/QC.hs index 18a4c21..fc1fdc7 100644 --- a/tests/QC.hs +++ b/tests/QC.hs @@ -22,6 +22,7 @@ import Data.ByteString.Short (ShortByteString) import Data.Int import Data.Ratio import Data.Typeable +import Data.Word import System.IO.Unsafe import Data.Orphans ()