4429b86 · typeable/aeson

Data/Aeson/Types/Instances.hs+2−1

compare with master

unifiedsplit

@@ -74,7 +74,8 @@ import Data.Monoid (Dual(..), First(..), Last(..))

74import Data.Ratio (Ratio, (%), numerator, denominator)

75import Data.Scientific (Scientific)

76import Data.Text (Text, pack, unpack)

77−import Data.Time (Day, LocalTime, NominalDiffTime, UTCTime, ZonedTime, TimeOfDay)

77+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime,

78+ ZonedTime)

78import Data.Time.Format (FormatTime, formatTime, parseTime)

79import Data.Time.Format (FormatTime, formatTime, parseTime)

79import Data.Traversable as Tr (sequence)

80import Data.Traversable as Tr (sequence)

80import Data.Vector (Vector)

81import Data.Vector (Vector)

tests/Instances.hs+2−6

@@ -6,11 +6,8 @@ module Instances where

6import Types

7import Data.Function (on)

8import Control.Monad

9−import Test.QuickCheck (Arbitrary(..), Gen, choose, oneof, elements, Positive(..))

9+import Test.QuickCheck (Arbitrary(..), Gen, choose, getNonNegative, elements,

10−import Test.QuickCheck

10+ listOf1, oneof, resize)

11− ( Arbitrary(..), Gen, choose, oneof, elements

12− , resize, listOf1, getNonNegative

13− )

14import Data.Time.Clock (DiffTime, UTCTime(..), picosecondsToDiffTime)

11import Data.Time.Clock (DiffTime, UTCTime(..), picosecondsToDiffTime)

15import Data.Fixed (Pico)

12import Data.Fixed (Pico)

16import Data.Time (ZonedTime(..), LocalTime(..), TimeZone(..),

13import Data.Time (ZonedTime(..), LocalTime(..), TimeZone(..),

@@ -20,7 +17,6 @@ import Data.Version

20import qualified Data.Text as T

17import qualified Data.Text as T

21import qualified Data.Map as Map

18import qualified Data.Map as Map

22import Data.Text (Text)

19import Data.Text (Text)

23−import Data.Maybe

24import Data.Aeson.Types

20import Data.Aeson.Types

25import Control.Applicative

21import Control.Applicative

26import Functions

22import Functions

tests/Properties.hs+2−1

@@ -9,7 +9,8 @@ import Data.Aeson.Parser (value)

9import Data.Aeson.Types

10import Data.ByteString.Builder (toLazyByteString)

11import Data.Int (Int8)

12−import Data.Time (Day, LocalTime, NominalDiffTime, UTCTime, ZonedTime, TimeOfDay)

12+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime,

13+ ZonedTime)

13import Data.Version (Version)

14import Data.Version (Version)

14import Encoders

15import Encoders

15import Instances ()

16import Instances ()