Merge pull request #1026 from haskell/no-ffi

Resolve #992. Remove cffi flag, it has become obsolete

Author: phadej

.github/workflows/haskell-ci.yml

@@ -280,7 +280,7 @@ jobs:
           cabal-docspec $ARG_COMPILER
       - name: hlint
         run: |
-          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src attoparsec-iso8601/src src-pure src-ffi) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src attoparsec-iso8601/src src-pure) ; fi
           if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_attoparsec_iso8601} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src) ; fi
           if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson_examples} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src/) ; fi
           if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson_benchmarks} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 .) ; fi
@@ -314,10 +314,6 @@ jobs:
         run: |
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +ordered-keymap' all
           $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +ordered-keymap' all
-      - name: constraint set cffi
-        run: |
-          if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +cffi' all ; fi
-          if [ $((HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +cffi' all ; fi
       - name: save cache
         uses: actions/cache/save@v3
         if: always()

aeson.cabal

@@ -1,6 +1,5 @@
 name:               aeson
-version:            2.1.2.1
-x-revision:         3
+version:            2.2
 license:            BSD3
 license-file:       LICENSE
 category:           Text, Web, JSON
@@ -39,24 +38,15 @@ description:
 extra-source-files:
   *.yaml
   benchmarks/json-data/*.json
-  cbits/*.c
   changelog.md
   README.markdown
-  src-ffi/Data/Aeson/Parser/*.hs
   src-pure/Data/Aeson/Parser/*.hs
   tests/golden/*.expected
   tests/JSONTestSuite/results/*.tok
   tests/JSONTestSuite/results/*.txt
   tests/JSONTestSuite/test_parsing/*.json
   tests/JSONTestSuite/test_transform/*.json
 
-flag cffi
-  description:
-    Controls whether to include c-ffi bits or pure haskell. Default to False for security.
-
-  default:     False
-  manual:      True
-
 flag ordered-keymap
   description: Use ordered @Data.Map.Strict@ for KeyMap implementation.
   default:     True
@@ -148,16 +138,9 @@ library
 
   ghc-options:      -Wall
 
-  if (impl(ghcjs) || !flag(cffi))
-    hs-source-dirs: src-pure
-    other-modules:  Data.Aeson.Parser.UnescapePure
-
-  else
-    c-sources:      cbits/unescape_string.c
-    cpp-options:    -DCFFI
-    hs-source-dirs: src-ffi
-    other-modules:  Data.Aeson.Parser.UnescapeFFI
-    build-depends:  text <2.0
+  -- String unescaping
+  hs-source-dirs: src-pure
+  other-modules:  Data.Aeson.Parser.UnescapePure
 
   if flag(ordered-keymap)
     cpp-options: -DUSE_ORDEREDMAP=1

cabal.haskell-ci

@@ -12,12 +12,6 @@ hlint: True
 hlint-job: 9.2.8
 hlint-yaml: .hlint.yaml
 
-constraint-set cffi
-  ghc:         <9.4
-  constraints: aeson +cffi
-  tests:       True
-  run-tests:   True
-
 constraint-set ordered-keymap-on
   constraints: aeson +ordered-keymap
   tests:       True

cbits/unescape_string.c

@@ -1,5 +1,10 @@
 For the latest version of this document, please see [https://github.com/haskell/aeson/blob/master/changelog.md](https://github.com/haskell/aeson/blob/master/changelog.md).
 
+### 2.2
+
+* Remove `cffi` flag. Then the C implementation for string unescaping was used for `text <2` versions.
+  The new native Haskell implementation introduced in version 2.0.3.0 is at least as fast.
+
 ### 2.1.2.1
 
 * Support `th-abstraction-0.5`

changelog.md

@@ -4,8 +4,4 @@ module Data.Aeson.Parser.Unescape
     unescapeText
   ) where
 
-#ifdef CFFI
-import Data.Aeson.Parser.UnescapeFFI (unescapeText)
-#else
 import Data.Aeson.Parser.UnescapePure (unescapeText)
-#endif