Allow dlist-1.0, add DNonEmpty instances

Note: DNonEmpty module is available only with GHC >= 8.0

Author: phadej

.travis.yml

@@ -120,11 +120,6 @@ install:
   - if [ $HCNUMVER -ge 80200 ] ; then echo 'package aeson-examples' >> cabal.project ; fi
   - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
   - |
-    echo "packages:"                                                                                                      >> cabal.project
-    echo "  https://hackage.haskell.org/package/quickcheck-instances-0.3.24/candidate/quickcheck-instances-0.3.24.tar.gz" >> cabal.project
-    echo ""                                                                                                               >> cabal.project
-    echo "packages:"                                                                                                      >> cabal.project
-    echo "  https://hackage.haskell.org/package/strict-0.4/candidate/strict-0.4.tar.gz"                                   >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(aeson|aeson-examples|attoparsec-iso8601)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
@@ -162,11 +157,6 @@ script:
   - if [ $HCNUMVER -ge 80200 ] ; then echo 'package aeson-examples' >> cabal.project ; fi
   - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
   - |
-    echo "packages:"                                                                                                      >> cabal.project
-    echo "  https://hackage.haskell.org/package/quickcheck-instances-0.3.24/candidate/quickcheck-instances-0.3.24.tar.gz" >> cabal.project
-    echo ""                                                                                                               >> cabal.project
-    echo "packages:"                                                                                                      >> cabal.project
-    echo "  https://hackage.haskell.org/package/strict-0.4/candidate/strict-0.4.tar.gz"                                   >> cabal.project
   - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(aeson|aeson-examples|attoparsec-iso8601)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true

Data/Aeson/Types/FromJSON.hs

@@ -123,6 +123,9 @@ import qualified Data.Aeson.Parser.Time as Time
 import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.DList as DList
+#if MIN_VERSION_dlist(1,0,0) && __GLASGOW_HASKELL__ >=800
+import qualified Data.DList.DNonEmpty as DNE
+#endif
 import qualified Data.Fix as F
 import qualified Data.HashMap.Strict as H
 import qualified Data.HashSet as HashSet
@@ -1755,8 +1758,24 @@ instance (FromJSON a) => FromJSON (DList.DList a) where
     parseJSON = parseJSON1
     {-# INLINE parseJSON #-}
 
+#if MIN_VERSION_dlist(1,0,0) && __GLASGOW_HASKELL__ >=800
+-- | @since 1.5.3.0
+instance FromJSON1 DNE.DNonEmpty where
+    liftParseJSON p _ = withArray "DNonEmpty" $
+        (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
+      where
+        ne []     = fail "parsing DNonEmpty failed, unexpected empty list"
+        ne (x:xs) = pure (DNE.fromNonEmpty (x :| xs))
+    {-# INLINE liftParseJSON #-}
+
+-- | @since 1.5.3.0
+instance (FromJSON a) => FromJSON (DNE.DNonEmpty a) where
+    parseJSON = parseJSON1
+    {-# INLINE parseJSON #-}
+#endif
+
 -------------------------------------------------------------------------------
--- tranformers - Functors
+-- transformers - Functors
 -------------------------------------------------------------------------------
 
 instance FromJSON1 Identity where

Data/Aeson/Types/ToJSON.hs

@@ -103,6 +103,9 @@ import qualified Data.Aeson.Encoding as E
 import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.DList as DList
+#if MIN_VERSION_dlist(1,0,0) && __GLASGOW_HASKELL__ >=800
+import qualified Data.DList.DNonEmpty as DNE
+#endif
 import qualified Data.Fix as F
 import qualified Data.HashMap.Strict as H
 import qualified Data.HashSet as HashSet
@@ -1614,6 +1617,24 @@ instance (ToJSON a) => ToJSON (DList.DList a) where
     toEncoding = toEncoding1
     {-# INLINE toEncoding #-}
 
+#if MIN_VERSION_dlist(1,0,0) && __GLASGOW_HASKELL__ >=800
+-- | @since 1.5.3.0
+instance ToJSON1 DNE.DNonEmpty where
+    liftToJSON t _ = listValue t . DNE.toList
+    {-# INLINE liftToJSON #-}
+
+    liftToEncoding t _ = listEncoding t . DNE.toList
+    {-# INLINE liftToEncoding #-}
+
+-- | @since 1.5.3.0
+instance (ToJSON a) => ToJSON (DNE.DNonEmpty a) where
+    toJSON = toJSON1
+    {-# INLINE toJSON #-}
+
+    toEncoding = toEncoding1
+    {-# INLINE toEncoding #-}
+#endif
+
 -------------------------------------------------------------------------------
 -- transformers - Functors
 -------------------------------------------------------------------------------

aeson.cabal

@@ -137,7 +137,7 @@ library
   build-depends:
     attoparsec           >= 0.13.2.2 && < 0.14,
     data-fix             >= 0.3      && < 0.4,
-    dlist                >= 0.8.0.4  && < 0.9,
+    dlist                >= 0.8.0.4  && < 1.1,
     hashable             >= 1.2.7.0  && < 1.4,
     primitive            >= 0.7.0.1  && < 0.8,
     scientific           >= 0.3.6.2  && < 0.4,

benchmarks/aeson-benchmarks.cabal

@@ -9,6 +9,7 @@ library
   c-sources:        ../cbits/unescape_string.c
   build-depends:
       attoparsec
+    , data-fix
     , base
     , base-compat-batteries
     , bytestring             >=0.10.4
@@ -21,6 +22,7 @@ library
     , primitive
     , scientific
     , syb
+    , strict
     , tagged
     , template-haskell
     , text

cabal.bench.project

@@ -3,5 +3,5 @@ packages: benchmarks/
 packages: criterion-compare-txt/
 tests: false
 
-packages: https://oleg.fi/these-1.1.tar.gz
-packages: https://oleg.fi/quickcheck-instances-0.3.23.tar.gz
+packages: https://hackage.haskell.org/package/quickcheck-instances-0.3.24/candidate/quickcheck-instances-0.3.24.tar.gz
+packages: https://hackage.haskell.org/package/strict-0.4/candidate/strict-0.4.tar.gz

cabal.project

@@ -3,6 +3,3 @@ packages: .
 packages: attoparsec-iso8601
 packages: examples
 tests: true
-
-packages: https://hackage.haskell.org/package/quickcheck-instances-0.3.24/candidate/quickcheck-instances-0.3.24.tar.gz
-packages: https://hackage.haskell.org/package/strict-0.4/candidate/strict-0.4.tar.gz