git.iko.soy/typeable/aeson
on master help sign in
Merge branch 'master' of git://github.com/bos/aeson
commit3fa8ed971834804d6895af5a40d3128898b88832 authorgrdvnl <grdvnl@gmail.com> dateTue 15 Oct 2019, 06:05 (7 years ago) parente8a7590f26e93d
6 files changed+24−23
compare with master
unifiedsplit
.gitignore+1 .travis.yml+17−6 aeson.cabal+1−1 stack-bench.yaml+2−8 stack-ffi-unescape.yaml+2−7 tests/ErrorMessages.hs+1−1
.gitignore+1
@@ -5,6 +5,7 @@ dist-newstyle
55cabal.sandbox.config
66.stack-work/
77.stack-work-bench/
8+*.yaml.lock
89
910*.o
1011*.hi
.travis.yml+17−6
@@ -24,40 +24,51 @@ before_cache:
2424
2525matrix:
2626 include:
27+
2728 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
2829 compiler: ": #GHC 8.4.4"
2930 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
30− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-bench.yaml
31− compiler: ": #GHC 8.4.4"
32− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
33− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-ffi-unescape.yaml
34− compiler: ": #GHC 8.4.4"
35− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31+
32+ - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
33+ compiler: ": #GHC 8.6.5"
34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
35+
36+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
37+ compiler: ": #GHC 8.6.5"
38+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}
3639
3740 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1
3841 compiler: ": #GHC 8.8.1"
3942 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
43+
4044 - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
4145 compiler: ": #GHC 8.6.5"
4246 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
47+
4348 - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
4449 compiler: ": #GHC 8.4.4"
4550 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
51+
4652 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
4753 compiler: ": #GHC 8.2.2"
4854 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
55+
4956 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
5057 compiler: ": #GHC 8.0.2"
5158 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
59+
5260 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
5361 compiler: ": #GHC 7.10.3"
5462 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
63+
5564 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
5665 compiler: ": #GHC 7.8.4"
5766 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
67+
5868 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
5969 compiler: ": #GHC 7.6.3"
6070 addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
71+
6172 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
6273 compiler: ": #GHC 7.4.2"
6374 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
aeson.cabal+1−1
@@ -225,7 +225,7 @@ test-suite tests
225225 containers,
226226 directory,
227227 dlist,
228− Diff,
228+ Diff >= 0.4 && < 0.5,
229229 filepath,
230230 generic-deriving >= 1.10 && < 1.13,
231231 ghc-prim >= 0.2,
stack-bench.yaml+2−8
@@ -1,4 +1,4 @@
1−resolver: lts-12.26
1+resolver: nightly-2019-09-21
22# We use aeson in the snapshot to
33# - avoid recompilation of criterion
44# - compare against it
@@ -9,10 +9,4 @@ resolver: lts-12.26
99work-dir: .stack-work-bench
1010packages:
1111- benchmarks
12−extra-deps:
13−- base-orphans-0.8.1
14−- hashable-time-0.2.0.1
15−- QuickCheck-2.13.1
16−- quickcheck-instances-0.3.21
17−- splitmix-0.0.2
18−- time-compat-1.9.2.2
12+extra-deps: []
stack-ffi-unescape.yaml+2−7
@@ -1,4 +1,4 @@
1−resolver: lts-12.26
1+resolver: nightly-2019-09-21
22packages:
33- '.'
44flags:
@@ -6,9 +6,4 @@ flags:
66 fast: true
77 cffi: true
88extra-deps:
9−- base-orphans-0.8.1
10−- hashable-time-0.2.0.1
11−- QuickCheck-2.13.1
12−- quickcheck-instances-0.3.21
13−- splitmix-0.0.2
14−- time-compat-1.9.2.2
9+- Diff-0.4.0
tests/ErrorMessages.hs+1−1
@@ -13,7 +13,7 @@ import Data.Aeson (FromJSON(..), Value, json)
1313import Data.Aeson.Types (Parser)
1414import Data.Aeson.Parser (eitherDecodeWith)
1515import Data.Aeson.Internal (formatError, iparse)
16−import Data.Algorithm.Diff (Diff(..), getGroupedDiff)
16+import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)
1717import Data.Proxy (Proxy(..))
1818import Data.Semigroup ((<>))
1919import Data.Sequence (Seq)