HLint: Use the cabal_macros.h generated from stack/lts-8

Author: bergmark

.travis.yml

@@ -19,6 +19,9 @@ before_cache:
 
 matrix:
   include:
+    - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
       compiler: ": #GHC 8.0.2"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
@@ -40,9 +43,6 @@ matrix:
     - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
-    - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
-      compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
 
 before_install:
  - unset CC

Data/Aeson/Internal/Time.hs

@@ -20,14 +20,13 @@ module Data.Aeson.Internal.Time
 import Prelude ()
 import Prelude.Compat
 
-import Data.Fixed (Pico)
 import Data.Int (Int64)
 import Data.Time
 import Unsafe.Coerce (unsafeCoerce)
 
 #if MIN_VERSION_base(4,7,0)
 
-import Data.Fixed (Fixed(MkFixed))
+import Data.Fixed (Pico, Fixed(MkFixed))
 
 toPico :: Integer -> Pico
 toPico = MkFixed
@@ -37,6 +36,8 @@ fromPico (MkFixed i) = i
 
 #else
 
+import Data.Fixed (Pico)
+
 toPico :: Integer -> Pico
 toPico = unsafeCoerce
 

Data/Aeson/Parser/Internal.hs

@@ -221,6 +221,8 @@ jstring_ = {-# SCC "jstring_" #-} do
                     in Just (S a')
 
 data S = S Int#
+-- This hint will no longer trigger once hlint > 1.9.41 is released.
+{-# ANN S ("HLint: ignore Use newtype instead of data" :: String) #-}
 #else
     startState              = False
     go a c

Makefile

@@ -1,2 +1,2 @@
 lint:
-	hlint --cpp-include include/ .
+	hlint --cpp-include include/ --cpp-file .stack-work/dist/*/*Cabal-*/build/autogen/cabal_macros.h .

travis/script.sh

@@ -20,6 +20,7 @@ case $BUILD in
       (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
     ;;
   hlint)
+    stack build --fast aeson --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
     stack install hlint --resolver lts-8 --system-ghc --no-terminal
     make lint
     ;;