upgrade nightly snapshot (& hlint)

Author: bergmark

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"

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

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)

stack-bench.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2017-10-18
+resolver: nightly-2017-11-20
 # We use aeson in the snapshot to
 # - avoid recompilation of criterion
 # - compare against it

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2017-10-18
+resolver: nightly-2017-11-20
 packages:
 - '.'
 - attoparsec-iso8601