git.iko.soy/typeable/aeson
on master help sign in
Merge pull request #608 from bos/upgrade-hlint

upgrade GHC, snapshots, hlint

commit1a845c8c47b5ebf21a53a1f3b32ec52b14e7b70e authorAdam Bergmark <adam@bergmark.nl> dateSat 23 Dec 2017, 17:44 (9 years ago) parent733e323e9839cf
14 files changed+26−20
compare with master
unifiedsplit
.travis.yml+8−8 Data/Aeson/TH.hs+1−1 HLint.hs+1 aeson.cabal+1−1 benchmarks/Compare/BufferBuilder.hs−1 benchmarks/Compare/JsonBuilder.hs−1 cabal.project+1−1 examples/Twitter.hs−1 examples/Twitter/Manual.hs−1 ffi/Data/Aeson/Parser/UnescapeFFI.hs+1−1 stack-bench.yaml+2−2 stack-ffi-unescape.yaml+1−1 stack-lts10.yaml+9 stack-nightly.yaml+1−1
.travis.yml+8−8
@@ -19,14 +19,14 @@ before_cache:
1919
2020matrix:
2121 include:
22− - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1
23− compiler: ": #GHC 8.2.1"
24− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
25− - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml
26− compiler: ": #GHC 8.2.1"
27− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
28− - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml
29− compiler: ": #GHC 8.2.1"
22+ - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.2
23+ compiler: ": #GHC 8.2.2"
24+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
25+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-bench.yaml
26+ compiler: ": #GHC 8.2.2"
27+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
28+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-ffi-unescape.yaml
29+ compiler: ": #GHC 8.2.2"
3030 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
3131 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
3232 compiler: ": #GHC 8.0.2"
Data/Aeson/TH.hs+1−1
@@ -117,7 +117,7 @@ module Data.Aeson.TH
117117 ) where
118118
119119import Prelude ()
120−import Prelude.Compat hiding (exp)
120+import Prelude.Compat
121121
122122import Control.Applicative ((<|>))
123123import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
HLint.hs+1
@@ -8,3 +8,4 @@ ignore "Avoid lambda"
88ignore "Eta reduce"
99ignore "Functor law"
1010ignore "Use >=>"
11+ignore "Use lambda-case"
aeson.cabal+1−1
@@ -212,7 +212,7 @@ test-suite tests
212212 directory,
213213 dlist,
214214 filepath,
215− generic-deriving >= 1.10 && < 1.12,
215+ generic-deriving >= 1.10 && < 1.13,
216216 ghc-prim >= 0.2,
217217 hashable >= 1.2.4.0,
218218 scientific,
benchmarks/Compare/BufferBuilder.hs−1
@@ -12,7 +12,6 @@ import Prelude.Compat
1212import Data.BufferBuilder.Json
1313import Data.Int (Int64)
1414import Data.Monoid ((<>))
15−import Prelude hiding (id)
1615import Twitter
1716import qualified Data.BufferBuilder.Utf8 as UB
1817
benchmarks/Compare/JsonBuilder.hs−1
@@ -10,7 +10,6 @@ import Prelude.Compat
1010
1111import Data.Json.Builder
1212import Data.Monoid ((<>))
13−import Prelude hiding (id)
1413import Twitter
1514
1615instance JsObject Metadata where
cabal.project+1−1
@@ -1,2 +1,2 @@
11with-compiler: ghc
2−packages: ., attoparsec-iso8601
2+packages: ., attoparsec-iso8601, benchmarks
examples/Twitter.hs−1
@@ -27,7 +27,6 @@ import Data.Data (Typeable, Data)
2727import Data.Int (Int64)
2828import Data.Text (Text)
2929import GHC.Generics (Generic)
30−import Prelude hiding (id)
3130
3231{-# ANN module "Hlint: ignore Use camelCase" #-}
3332{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
examples/Twitter/Manual.hs−1
@@ -17,7 +17,6 @@ import Prelude.Compat
1717
1818import Control.Applicative
1919import Data.Monoid ((<>))
20−import Prelude hiding (id)
2120import Twitter
2221
2322import Data.Aeson hiding (Result)
ffi/Data/Aeson/Parser/UnescapeFFI.hs+1−1
@@ -10,7 +10,7 @@ module Data.Aeson.Parser.UnescapeFFI
1010import Control.Exception (evaluate, throw, try)
1111import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
1212import Data.ByteString as B
13−import Data.ByteString.Internal as B hiding (c2w)
13+import Data.ByteString.Internal as B
1414import Data.Text.Encoding.Error (UnicodeException (..))
1515import Data.Text.Internal (Text (..))
1616import Data.Text.Internal.Private (runText)
stack-bench.yaml+2−2
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-10-18
1+resolver: nightly-2017-12-23
22# We use aeson in the snapshot to
33# - avoid recompilation of criterion
44# - compare against it
@@ -10,4 +10,4 @@ work-dir: .stack-work-bench
1010packages:
1111- benchmarks
1212extra-deps:
13−- aeson-1.2.2.0
13+- aeson-1.2.3.0
stack-ffi-unescape.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-10-18
1+resolver: lts-10.0
22packages:
33- '.'
44flags:
stack-lts10.yamlnew file+9
@@ -0,0 +1,9 @@
1+resolver: lts-10.0
2+packages:
3+- '.'
4+flags:
5+ aeson:
6+ fast: true
7+ cffi: false
8+ attoparsec-iso8601:
9+ fast: true
stack-nightly.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-10-18
1+resolver: nightly-2017-12-23
22packages:
33- '.'
44- attoparsec-iso8601