text-show 3.2 → 3.2.1
raw patch · 4 files changed
+43/−11 lines, 4 filesdep ~text-show
Dependency ranges changed: text-show
Files
- CHANGELOG.md +3/−0
- src/TextShow/FromStringTextShow.hs +37/−8
- tests/Instances/GHC/Stack.hs +1/−1
- text-show.cabal +2/−2
CHANGELOG.md view
@@ -1,3 +1,6 @@+### 3.2.1+* Fixed compilation on GHC 8.0+ ## 3.2 * Rewrote `TextShow.Generic` to enable more code reuse. The `GTextShow1` and `GTextShow1Con` classes were eliminated, and `GTextShow` and `GTextShowCon` were redesigned to be able to generically implement both `showbPrec` and `liftShowbPrec`. The latter two classes now take an additional `arity` type parameter which is `Zero` if `TextShow` is being derived and `One` is `TextShow1` is being derived.
src/TextShow/FromStringTextShow.hs view
@@ -222,6 +222,7 @@ -- /Since: 3/ newtype FromStringShow1 f a = FromStringShow1 { fromStringShow1 :: f a } deriving ( Eq+ , Ord #if __GLASGOW_HASKELL__ >= 706 , Generic # if defined(__LANGUAGE_DERIVE_GENERIC1__)@@ -229,20 +230,28 @@ # endif #endif #if __GLASGOW_HASKELL__ >= 800+ , Data+ , Foldable+ , Functor , Lift+ , Show1 -- TODO: Manually implement this when you+ -- can derive Show1 (someday)+ , Traversable #endif- , Ord ) +#if __GLASGOW_HASKELL__ < 800+-- TODO: Manually implement this when you can derive Show1 (someday) deriving instance Show1 f => Show1 (FromStringShow1 f) deriving instance Functor f => Functor (FromStringShow1 f) deriving instance Foldable f => Foldable (FromStringShow1 f) deriving instance Traversable f => Traversable (FromStringShow1 f) -#if __GLASGOW_HASKELL__ >= 708+# if __GLASGOW_HASKELL__ >= 708 deriving instance Typeable FromStringShow1 deriving instance ( Data (f a), Typeable f, Typeable a ) => Data (FromStringShow1 f (a :: *))+# endif #endif instance Read (f a) => Read (FromStringShow1 f a) where@@ -293,6 +302,7 @@ -- /Since: 3/ newtype FromTextShow1 f a = FromTextShow1 { fromTextShow1 :: f a } deriving ( Eq+ , Ord #if __GLASGOW_HASKELL__ >= 706 , Generic # if defined(__LANGUAGE_DERIVE_GENERIC1__)@@ -300,20 +310,26 @@ # endif #endif #if __GLASGOW_HASKELL__ >= 800+ , Data+ , Foldable+ , Functor , Lift+ , TextShow1+ , Traversable #endif- , Ord ) +#if __GLASGOW_HASKELL__ < 800 deriving instance TextShow1 f => TextShow1 (FromTextShow1 f) deriving instance Functor f => Functor (FromTextShow1 f) deriving instance Foldable f => Foldable (FromTextShow1 f) deriving instance Traversable f => Traversable (FromTextShow1 f) -#if __GLASGOW_HASKELL__ >= 708+# if __GLASGOW_HASKELL__ >= 708 deriving instance Typeable FromTextShow1 deriving instance ( Data (f a), Typeable f, Typeable a ) => Data (FromTextShow1 f (a :: *))+# endif #endif instance Read (f a) => Read (FromTextShow1 f a) where@@ -369,6 +385,7 @@ -- /Since: 3/ newtype FromStringShow2 f a b = FromStringShow2 { fromStringShow2 :: f a b } deriving ( Eq+ , Ord #if __GLASGOW_HASKELL__ >= 706 , Generic # if defined(__LANGUAGE_DERIVE_GENERIC1__)@@ -376,19 +393,24 @@ # endif #endif #if __GLASGOW_HASKELL__ >= 800+ , Data+ , Foldable+ , Functor , Lift+ , Traversable #endif- , Ord ) +#if __GLASGOW_HASKELL__ < 800 deriving instance Functor (f a) => Functor (FromStringShow2 f a) deriving instance Foldable (f a) => Foldable (FromStringShow2 f a) deriving instance Traversable (f a) => Traversable (FromStringShow2 f a) -#if __GLASGOW_HASKELL__ >= 708+# if __GLASGOW_HASKELL__ >= 708 deriving instance Typeable FromStringShow2 deriving instance ( Data (f a b), Typeable f, Typeable a, Typeable b ) => Data (FromStringShow2 f (a :: *) (b :: *))+# endif #endif instance Read (f a b) => Read (FromStringShow2 f a b) where@@ -462,6 +484,7 @@ -- /Since: 3/ newtype FromTextShow2 f a b = FromTextShow2 { fromTextShow2 :: f a b } deriving ( Eq+ , Ord #if __GLASGOW_HASKELL__ >= 706 , Generic # if defined(__LANGUAGE_DERIVE_GENERIC1__)@@ -469,20 +492,26 @@ # endif #endif #if __GLASGOW_HASKELL__ >= 800+ , Data+ , Foldable+ , Functor , Lift+ , TextShow2+ , Traversable #endif- , Ord ) +#if __GLASGOW_HASKELL__ < 800 deriving instance TextShow2 f => TextShow2 (FromTextShow2 f) deriving instance Functor (f a) => Functor (FromTextShow2 f a) deriving instance Foldable (f a) => Foldable (FromTextShow2 f a) deriving instance Traversable (f a) => Traversable (FromTextShow2 f a) -#if __GLASGOW_HASKELL__ >= 708+# if __GLASGOW_HASKELL__ >= 708 deriving instance Typeable FromTextShow2 deriving instance ( Data (f a b), Typeable f, Typeable a, Typeable b ) => Data (FromTextShow2 f (a :: *) (b :: *))+# endif #endif instance Read (f a b) => Read (FromTextShow2 f a b) where
tests/Instances/GHC/Stack.hs view
@@ -26,7 +26,7 @@ instance Arbitrary CallStack where arbitrary = oneof [ pure EmptyCallStack- , PushCallStack <$> arbitrary <@> EmptyCallStack+ , PushCallStack <$> arbitrary <*> arbitrary <@> EmptyCallStack , pure $ FreezeCallStack EmptyCallStack ]
text-show.cabal view
@@ -1,5 +1,5 @@ name: text-show-version: 3.2+version: 3.2.1 synopsis: Efficient conversion of values into Text description: @text-show@ offers a replacement for the @Show@ typeclass intended for use with @Text@ instead of @String@s. This package was created@@ -355,7 +355,7 @@ if impl(ghc >= 8.0) build-depends: ghc-boot if !flag(developer)- build-depends: text-show == 3.2+ build-depends: text-show == 3.2.1 hs-source-dirs: tests if flag(developer)