Merge pull request #1027 from haskell/hlint-job

Resurrect hlint job

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.16.3
+# version: 0.16.4
 #
-# REGENDATA ("0.16.3",["github","cabal.project"])
+# REGENDATA ("0.16.4",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,19 +32,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.1
+          - compiler: ghc-9.6.2
             compilerKind: ghc
-            compilerVersion: 9.6.1
+            compilerVersion: 9.6.2
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.4
+          - compiler: ghc-9.4.5
             compilerKind: ghc
-            compilerVersion: 9.4.4
+            compilerVersion: 9.4.5
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.7
+          - compiler: ghc-9.2.8
             compilerKind: ghc
-            compilerVersion: 9.2.7
+            compilerVersion: 9.2.8
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2
@@ -172,7 +172,7 @@ jobs:
       - name: cache (tools)
         uses: actions/cache/restore@v3
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a3d9d05c
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-cb947dfc
           path: ~/.haskell-ci-tools
       - name: install cabal-plan
         run: |
@@ -192,11 +192,17 @@ jobs:
           rm -f cabal-docspec.xz
           chmod a+x $HOME/.cabal/bin/cabal-docspec
           cabal-docspec --version
+      - name: install hlint
+        run: |
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint  --constraint='hlint >=3.5 && <3.6' |  perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then hlint --version ; fi
       - name: save cache (tools)
         uses: actions/cache/save@v3
         if: always()
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a3d9d05c
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-cb947dfc
           path: ~/.haskell-ci-tools
       - name: checkout
         uses: actions/checkout@v3
@@ -272,6 +278,13 @@ jobs:
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all
           cabal-docspec $ARG_COMPILER
+      - name: hlint
+        run: |
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src attoparsec-iso8601/src src-pure src-ffi) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_attoparsec_iso8601} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson_examples} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src/) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson_benchmarks} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 .) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_aeson_benchmarks} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 bench examples/src) ; fi
       - name: haddock
         run: |
           if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi

.hlint.yaml

@@ -19,3 +19,20 @@
     name: "Use fewer imports"
     within:
       - Data.Aeson.Types.Internal
+- ignore:
+    name: "Unused LANGUAGE pragma"
+    within:
+      - Data.Aeson.Internal.Text
+      - Compare.JsonBench
+
+- ignore: { name: "Use fewer imports" }
+- ignore: { name: "Use lambda-case" }
+- ignore: { name: "Use camelCase" }
+- ignore: { name: "Redundant multi-way if" }
+
+- ignore: { name: "Use <$>" }
+- ignore: { name: "Use fmap" }
+- ignore: { name: "Use curry" }
+- ignore: { name: "Use const" }
+- ignore: { name: "Use -" }
+- ignore: { name: "Use /=" }

Makefile

@@ -1,2 +1,2 @@
 lint:
-	./run-hlint.sh --cpp-include include/ --cpp-file travis/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/
+	./run-hlint.sh --cpp-include include/ src/ attoparsec-iso8601/ benchmarks/ examples/ src-pure/ tests/

aeson.cabal

@@ -18,9 +18,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.4
-   || ==9.6.1
+   || ==9.2.8
+   || ==9.4.5
+   || ==9.6.2
 
 synopsis:           Fast JSON parsing and encoding
 cabal-version:      >=1.10

attoparsec-iso8601/attoparsec-iso8601.cabal

@@ -14,7 +14,7 @@ cabal-version:   >=1.10
 homepage:        https://github.com/haskell/aeson
 bug-reports:     https://github.com/haskell/aeson/issues
 build-type:      Simple
-tested-with:     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC ==9.2.7, GHC==9.4.4, GHC ==9.6.1
+tested-with:     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC ==9.2.8, GHC==9.4.5, GHC ==9.6.2
 extra-source-files:
   README.md
   changelog.md

benchmarks/aeson-benchmarks.cabal

@@ -9,9 +9,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.4
-   || ==9.6.1
+   || ==9.2.8
+   || ==9.4.5
+   || ==9.6.2
 
 flag tasty-bench
   description: Use tasty-bench, otherwise criterion

cabal.haskell-ci

@@ -9,7 +9,7 @@ install-dependencies: False
 haddock: >=8.6
 
 hlint: True
-hlint-job: 8.8.3
+hlint-job: 9.2.8
 hlint-yaml: .hlint.yaml
 
 constraint-set cffi

examples/aeson-examples.cabal

@@ -15,9 +15,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.4
-   || ==9.6.1
+   || ==9.2.8
+   || ==9.4.5
+   || ==9.6.2
 
 library twitter-generic
   default-language: Haskell2010

src/Data/Aeson/Decoding/Tokens.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveTraversable #-}
 -- | Token definitions.
 module Data.Aeson.Decoding.Tokens (
     -- * Types

src/Data/Aeson/Types/ToJSON.hs

@@ -1476,7 +1476,7 @@ instance ToJSON LT.Text where
     toEncoding = E.lazyText
 
 instance ToJSONKey LT.Text where
-    toJSONKey = toJSONKeyText (LT.toStrict)
+    toJSONKey = toJSONKeyText LT.toStrict
 
 -- | @since 2.0.2.0
 instance ToJSON ST.ShortText where