rest-stringmap 0.2.0.6 → 0.2.0.7
raw patch · 8 files changed
+43/−16 lines, 8 filesdep ~aesondep ~basePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: aeson, base
API changes (from Hackage documentation)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] (Eq a, Eq b) => Eq (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] (Eq a, Hashable a, IsString a, FromJSON b) => FromJSON (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] (Show a, Show b) => Show (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] (ToString a, ToJSON b) => ToJSON (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] JSONSchema b => JSONSchema (StringHashMap a b)
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] Typeable StringHashMap
- Rest.StringMap.HashMap.Lazy: instance [overlap ok] XmlPickler b => XmlPickler (StringHashMap String b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] (Eq a, Eq b) => Eq (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] (Eq a, Hashable a, IsString a, FromJSON b) => FromJSON (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] (Show a, Show b) => Show (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] (ToString a, ToJSON b) => ToJSON (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] JSONSchema b => JSONSchema (StringHashMap a b)
- Rest.StringMap.HashMap.Strict: instance [overlap ok] Typeable StringHashMap
- Rest.StringMap.HashMap.Strict: instance [overlap ok] XmlPickler b => XmlPickler (StringHashMap String b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] (Eq a, Eq b) => Eq (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] (Ord a, IsString a, FromJSON b) => FromJSON (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] (Show a, Show b) => Show (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] (ToString a, ToJSON b) => ToJSON (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] JSONSchema b => JSONSchema (StringMap a b)
- Rest.StringMap.Map.Lazy: instance [overlap ok] Typeable StringMap
- Rest.StringMap.Map.Lazy: instance [overlap ok] XmlPickler b => XmlPickler (StringMap String b)
- Rest.StringMap.Map.Strict: instance [overlap ok] (Eq a, Eq b) => Eq (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] (Ord a, IsString a, FromJSON b) => FromJSON (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] (Show a, Show b) => Show (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] (ToString a, ToJSON b) => ToJSON (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] JSONSchema b => JSONSchema (StringMap a b)
- Rest.StringMap.Map.Strict: instance [overlap ok] Typeable StringMap
- Rest.StringMap.Map.Strict: instance [overlap ok] XmlPickler b => XmlPickler (StringMap String b)
+ Rest.StringMap.HashMap.Lazy: instance (Data.String.ToString.ToString a, Data.Aeson.Types.ToJSON.ToJSON b) => Data.Aeson.Types.ToJSON.ToJSON (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance (GHC.Classes.Eq a, Data.Hashable.Class.Hashable a, Data.String.IsString a, Data.Aeson.Types.FromJSON.FromJSON b) => Data.Aeson.Types.FromJSON.FromJSON (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance (GHC.Classes.Eq a, Data.Hashable.Class.Hashable a, Data.String.IsString a, Data.String.ToString.ToString a, Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b) => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance (GHC.Classes.Eq b, GHC.Classes.Eq a) => GHC.Classes.Eq (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance (GHC.Show.Show b, GHC.Show.Show a) => GHC.Show.Show (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance Data.JSON.Schema.Types.JSONSchema b => Data.JSON.Schema.Types.JSONSchema (Rest.StringMap.HashMap.Lazy.StringHashMap a b)
+ Rest.StringMap.HashMap.Lazy: instance Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.HashMap.Lazy.StringHashMap GHC.Base.String b)
+ Rest.StringMap.HashMap.Strict: instance (Data.String.ToString.ToString a, Data.Aeson.Types.ToJSON.ToJSON b) => Data.Aeson.Types.ToJSON.ToJSON (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance (GHC.Classes.Eq a, Data.Hashable.Class.Hashable a, Data.String.IsString a, Data.Aeson.Types.FromJSON.FromJSON b) => Data.Aeson.Types.FromJSON.FromJSON (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance (GHC.Classes.Eq a, Data.Hashable.Class.Hashable a, Data.String.IsString a, Data.String.ToString.ToString a, Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b) => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance (GHC.Classes.Eq b, GHC.Classes.Eq a) => GHC.Classes.Eq (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance (GHC.Show.Show b, GHC.Show.Show a) => GHC.Show.Show (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance Data.JSON.Schema.Types.JSONSchema b => Data.JSON.Schema.Types.JSONSchema (Rest.StringMap.HashMap.Strict.StringHashMap a b)
+ Rest.StringMap.HashMap.Strict: instance Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.HashMap.Strict.StringHashMap GHC.Base.String b)
+ Rest.StringMap.Map.Lazy: instance (Data.String.ToString.ToString a, Data.Aeson.Types.ToJSON.ToJSON b) => Data.Aeson.Types.ToJSON.ToJSON (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance (GHC.Classes.Eq b, GHC.Classes.Eq a) => GHC.Classes.Eq (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance (GHC.Classes.Ord a, Data.String.IsString a, Data.Aeson.Types.FromJSON.FromJSON b) => Data.Aeson.Types.FromJSON.FromJSON (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance (GHC.Classes.Ord a, Data.String.IsString a, Data.String.ToString.ToString a, Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b) => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance (GHC.Show.Show b, GHC.Show.Show a) => GHC.Show.Show (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance Data.JSON.Schema.Types.JSONSchema b => Data.JSON.Schema.Types.JSONSchema (Rest.StringMap.Map.Lazy.StringMap a b)
+ Rest.StringMap.Map.Lazy: instance Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.Map.Lazy.StringMap GHC.Base.String b)
+ Rest.StringMap.Map.Strict: instance (Data.String.ToString.ToString a, Data.Aeson.Types.ToJSON.ToJSON b) => Data.Aeson.Types.ToJSON.ToJSON (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance (GHC.Classes.Eq b, GHC.Classes.Eq a) => GHC.Classes.Eq (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance (GHC.Classes.Ord a, Data.String.IsString a, Data.Aeson.Types.FromJSON.FromJSON b) => Data.Aeson.Types.FromJSON.FromJSON (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance (GHC.Classes.Ord a, Data.String.IsString a, Data.String.ToString.ToString a, Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b) => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance (GHC.Show.Show b, GHC.Show.Show a) => GHC.Show.Show (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance Data.JSON.Schema.Types.JSONSchema b => Data.JSON.Schema.Types.JSONSchema (Rest.StringMap.Map.Strict.StringMap a b)
+ Rest.StringMap.Map.Strict: instance Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler b => Text.XML.HXT.Arrow.Pickle.Xml.XmlPickler (Rest.StringMap.Map.Strict.StringMap GHC.Base.String b)
Files
- CHANGELOG.md +1/−0
- include/monad-compat.h +5/−0
- include/overlapping-compat.h +8/−0
- rest-stringmap.cabal +5/−3
- src/Rest/StringMap/HashMap/Lazy.hs +6/−4
- src/Rest/StringMap/HashMap/Strict.hs +6/−3
- src/Rest/StringMap/Map/Lazy.hs +6/−3
- src/Rest/StringMap/Map/Strict.hs +6/−3
CHANGELOG.md view
@@ -3,6 +3,7 @@ #### 0.2.0.6 * Fix compilation on GHC-7.6+* (revision) Allow `aeson 0.10.*` #### 0.2.0.5
+ include/monad-compat.h view
@@ -0,0 +1,5 @@+#if __GLASGOW_HASKELL__ >= 800+#define MONAD_ Monad m =>+#else+#define MONAD_ (Applicative m, Functor m, Monad m) =>+#endif
+ include/overlapping-compat.h view
@@ -0,0 +1,8 @@+#if __GLASGOW_HASKELL__ >= 710+#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}+#define OVERLAPPING_ {-# OVERLAPPING #-}+#else+{-# LANGUAGE OverlappingInstances #-}+#define OVERLAPPABLE_+#define OVERLAPPING_+#endif
rest-stringmap.cabal view
@@ -1,5 +1,5 @@ name: rest-stringmap-version: 0.2.0.6+version: 0.2.0.7 license: BSD3 license-file: LICENSE synopsis: Maps with stringy keys that can be transcoded to JSON and XML.@@ -12,6 +12,7 @@ cabal-version: >=1.10 extra-source-files:+ include/*.h CHANGELOG.md LICENSE @@ -19,6 +20,7 @@ default-language: Haskell2010 ghc-options: -Wall hs-source-dirs: src+ include-dirs: include exposed-modules: Rest.StringMap.HashMap.Lazy Rest.StringMap.HashMap.Strict@@ -26,8 +28,8 @@ Rest.StringMap.Map.Strict Rest.StringMap.Util build-depends:- base >= 4.6 && < 4.9- , aeson >= 0.7 && < 0.10+ base >= 4.6 && < 4.12+ , aeson >= 0.7 && < 1.4 , containers == 0.5.* , hashable == 1.2.* , hxt == 9.3.*
src/Rest/StringMap/HashMap/Lazy.hs view
@@ -1,9 +1,12 @@ {-# LANGUAGE- DeriveDataTypeable+ CPP+ , DeriveDataTypeable , FlexibleInstances- , OverlappingInstances , ScopedTypeVariables #-}++#include "overlapping-compat.h"+ module Rest.StringMap.HashMap.Lazy ( StringHashMap , fromHashMap@@ -48,7 +51,7 @@ xpickle = pickleStringMap fromList toList -- | General case-instance (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b) where+instance OVERLAPPABLE_ (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b) where xpickle = pickleMap mapKeys mapKeys instance (ToString a, ToJSON b) => ToJSON (StringHashMap a b) where@@ -59,4 +62,3 @@ instance JSONSchema b => JSONSchema (StringHashMap a b) where schema _ = mapSchema (Proxy :: Proxy b)-
src/Rest/StringMap/HashMap/Strict.hs view
@@ -1,9 +1,12 @@ {-# LANGUAGE- DeriveDataTypeable+ CPP+ , DeriveDataTypeable , FlexibleInstances- , OverlappingInstances , ScopedTypeVariables #-}++#include "overlapping-compat.h"+ module Rest.StringMap.HashMap.Strict ( StringHashMap , fromHashMap@@ -48,7 +51,7 @@ xpickle = pickleStringMap fromList toList -- | General case-instance (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b) where+instance OVERLAPPABLE_ (Eq a, Hashable a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringHashMap a b) where xpickle = pickleMap mapKeys mapKeys instance (ToString a, ToJSON b) => ToJSON (StringHashMap a b) where
src/Rest/StringMap/Map/Lazy.hs view
@@ -1,9 +1,12 @@ {-# LANGUAGE- DeriveDataTypeable+ CPP+ , DeriveDataTypeable , FlexibleInstances- , OverlappingInstances , ScopedTypeVariables #-}++#include "overlapping-compat.h"+ module Rest.StringMap.Map.Lazy ( StringMap , fromMap@@ -44,7 +47,7 @@ instance XmlPickler b => XmlPickler (StringMap String b) where xpickle = pickleStringMap fromList toList -instance (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b) where+instance OVERLAPPABLE_ (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b) where xpickle = pickleMap mapKeys mapKeys instance (ToString a, ToJSON b) => ToJSON (StringMap a b) where
src/Rest/StringMap/Map/Strict.hs view
@@ -1,9 +1,12 @@ {-# LANGUAGE- DeriveDataTypeable+ CPP+ , DeriveDataTypeable , FlexibleInstances- , OverlappingInstances , ScopedTypeVariables #-}++#include "overlapping-compat.h"+ module Rest.StringMap.Map.Strict ( StringMap , fromMap@@ -44,7 +47,7 @@ instance XmlPickler b => XmlPickler (StringMap String b) where xpickle = pickleStringMap fromList toList -instance (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b) where+instance OVERLAPPABLE_ (Ord a, IsString a, ToString a, XmlPickler b) => XmlPickler (StringMap a b) where xpickle = pickleMap mapKeys mapKeys instance (ToString a, ToJSON b) => ToJSON (StringMap a b) where