f26e93d · typeable/aeson

git.iko.soy/typeable/aeson

on master help sign in

Merge pull request #732 from bos/diff

f26e93dAdam Bergmark7 years ago

.gitignore+1

compare with master

unifiedsplit

@@ -5,6 +5,7 @@ dist-newstyle

5cabal.sandbox.config

6.stack-work/

7.stack-work-bench/

8+*.yaml.lock

9*.o

10*.o

10*.hi

11*.hi

.travis.yml+17−6

@@ -24,40 +24,51 @@ before_cache:

25matrix:

26 include:

27+

27 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4

28 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4

28 compiler: ": #GHC 8.4.4"

29 compiler: ": #GHC 8.4.4"

29 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

30 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

31+

30− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-bench.yaml

32+ - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml

31− compiler: ": #GHC 8.4.4"

33+ compiler: ": #GHC 8.6.5"

32− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

35+

33− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-ffi-unescape.yaml

36+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml

34− compiler: ": #GHC 8.4.4"

37+ compiler: ": #GHC 8.6.5"

35− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

38+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}

37 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1

40 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1

38 compiler: ": #GHC 8.8.1"

41 compiler: ": #GHC 8.8.1"

39 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}

42 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}

43+

40 - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5

44 - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5

41 compiler: ": #GHC 8.6.5"

45 compiler: ": #GHC 8.6.5"

42 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

46 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

47+

43 - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4

48 - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4

44 compiler: ": #GHC 8.4.4"

49 compiler: ": #GHC 8.4.4"

45 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

50 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

51+

46 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2

52 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2

47 compiler: ": #GHC 8.2.2"

53 compiler: ": #GHC 8.2.2"

48 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

54 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

55+

49 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2

56 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2

50 compiler: ": #GHC 8.0.2"

57 compiler: ": #GHC 8.0.2"

51 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}

58 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}

59+

52 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

60 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

53 compiler: ": #GHC 7.10.3"

61 compiler: ": #GHC 7.10.3"

54 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

62 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

63+

55 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4

64 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4

56 compiler: ": #GHC 7.8.4"

65 compiler: ": #GHC 7.8.4"

57 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}

66 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}

67+

58 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3

68 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3

59 compiler: ": #GHC 7.6.3"

69 compiler: ": #GHC 7.6.3"

60 addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}

70 addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}

71+

61 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2

72 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2

62 compiler: ": #GHC 7.4.2"

73 compiler: ": #GHC 7.4.2"

63 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}

74 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

225 containers,

226 directory,

227 dlist,

228− Diff,

228+ Diff >= 0.4 && < 0.5,

229 filepath,

230 generic-deriving >= 1.10 && < 1.13,

231 ghc-prim >= 0.2,

stack-bench.yaml+2−8

@@ -1,4 +1,4 @@

1−resolver: lts-12.26

1+resolver: nightly-2019-09-21

2# We use aeson in the snapshot to

3# - avoid recompilation of criterion

4# - compare against it

@@ -9,10 +9,4 @@ resolver: lts-12.26

9work-dir: .stack-work-bench

10packages:

11- benchmarks

12−extra-deps:

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

stack-ffi-unescape.yaml+2−7

@@ -1,4 +1,4 @@

1−resolver: lts-12.26

1+resolver: nightly-2019-09-21

2packages:

3- '.'

4flags:

@@ -6,9 +6,4 @@ flags:

6 fast: true

7 cffi: true

8extra-deps:

9−- base-orphans-0.8.1

9+- Diff-0.4.0

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

tests/ErrorMessages.hs+1−1

@@ -13,7 +13,7 @@ import Data.Aeson (FromJSON(..), Value, json)

13import Data.Aeson.Types (Parser)

14import Data.Aeson.Parser (eitherDecodeWith)

15import Data.Aeson.Internal (formatError, iparse)

16−import Data.Algorithm.Diff (Diff(..), getGroupedDiff)

16+import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)

17import Data.Proxy (Proxy(..))

18import Data.Semigroup ((<>))

19import Data.Sequence (Seq)