Merge pull request #608 from bos/upgrade-hlint

upgrade GHC, snapshots, hlint

Author: bergmark

.travis.yml

@@ -19,14 +19,14 @@ before_cache:
 
 matrix:
   include:
-    - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1
-      compiler: ": #GHC 8.2.1"
-      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
-    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml
-      compiler: ": #GHC 8.2.1"
-      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
-    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml
-      compiler: ": #GHC 8.2.1"
+    - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.2
+      compiler: ": #GHC 8.2.2"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-bench.yaml
+      compiler: ": #GHC 8.2.2"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-ffi-unescape.yaml
+      compiler: ": #GHC 8.2.2"
       addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
       compiler: ": #GHC 8.0.2"

Data/Aeson/TH.hs

@@ -117,7 +117,7 @@ module Data.Aeson.TH
     ) where
 
 import Prelude ()
-import Prelude.Compat hiding (exp)
+import Prelude.Compat
 
 import Control.Applicative ((<|>))
 import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))

HLint.hs

@@ -8,3 +8,4 @@ ignore "Avoid lambda"
 ignore "Eta reduce"
 ignore "Functor law"
 ignore "Use >=>"
+ignore "Use lambda-case"

aeson.cabal

@@ -212,7 +212,7 @@ test-suite tests
     directory,
     dlist,
     filepath,
-    generic-deriving >= 1.10 && < 1.12,
+    generic-deriving >= 1.10 && < 1.13,
     ghc-prim >= 0.2,
     hashable >= 1.2.4.0,
     scientific,

benchmarks/Compare/BufferBuilder.hs

@@ -12,7 +12,6 @@ import Prelude.Compat
 import Data.BufferBuilder.Json
 import Data.Int (Int64)
 import Data.Monoid ((<>))
-import Prelude hiding (id)
 import Twitter
 import qualified Data.BufferBuilder.Utf8 as UB
 

benchmarks/Compare/JsonBuilder.hs

@@ -10,7 +10,6 @@ import Prelude.Compat
 
 import Data.Json.Builder
 import Data.Monoid ((<>))
-import Prelude hiding (id)
 import Twitter
 
 instance JsObject Metadata where

cabal.project

@@ -1,2 +1,2 @@
 with-compiler: ghc
-packages: ., attoparsec-iso8601
+packages: ., attoparsec-iso8601, benchmarks

examples/Twitter.hs

@@ -27,7 +27,6 @@ import Data.Data (Typeable, Data)
 import Data.Int (Int64)
 import Data.Text (Text)
 import GHC.Generics (Generic)
-import Prelude hiding (id)
 
 {-# ANN module "Hlint: ignore Use camelCase" #-}
 {-# ANN module "Hlint: ignore Use newtype instead of data" #-}

examples/Twitter/Manual.hs

@@ -17,7 +17,6 @@ import Prelude.Compat
 
 import Control.Applicative
 import Data.Monoid ((<>))
-import Prelude hiding (id)
 import Twitter
 
 import Data.Aeson hiding (Result)

ffi/Data/Aeson/Parser/UnescapeFFI.hs

@@ -10,7 +10,7 @@ module Data.Aeson.Parser.UnescapeFFI
 import Control.Exception (evaluate, throw, try)
 import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
 import Data.ByteString as B
-import Data.ByteString.Internal as B hiding (c2w)
+import Data.ByteString.Internal as B
 import Data.Text.Encoding.Error (UnicodeException (..))
 import Data.Text.Internal (Text (..))
 import Data.Text.Internal.Private (runText)