From 4019bd09f6e4df3693c8c12b98931f4566a4a065 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 16 May 2024 19:26:39 +0300 Subject: [PATCH] Support GHC-8.6.5..GHC-9.10.1 --- .github/workflows/haskell-ci.yml | 138 ++++++++++----------------- CHANGELOG.md | 4 + cabal.project | 4 + lattices.cabal | 30 ++---- src/Algebra/Heyting.hs | 3 - src/Algebra/Heyting/Free.hs | 3 - src/Algebra/Heyting/Free/Expr.hs | 3 - src/Algebra/Lattice.hs | 3 - src/Algebra/Lattice/Divisibility.hs | 3 - src/Algebra/Lattice/Dropped.hs | 3 - src/Algebra/Lattice/Free.hs | 3 - src/Algebra/Lattice/Free/Final.hs | 3 - src/Algebra/Lattice/Levitated.hs | 3 - src/Algebra/Lattice/Lexicographic.hs | 3 - src/Algebra/Lattice/Lifted.hs | 3 - src/Algebra/Lattice/M2.hs | 3 - src/Algebra/Lattice/M3.hs | 3 - src/Algebra/Lattice/N5.hs | 3 - src/Algebra/Lattice/Op.hs | 3 - src/Algebra/Lattice/Ordered.hs | 3 - src/Algebra/Lattice/Wide.hs | 3 - src/Algebra/Lattice/ZeroHalfOne.hs | 3 - src/Algebra/PartialOrd.hs | 2 +- test/Tests.hs | 7 -- 24 files changed, 64 insertions(+), 175 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e84843d..d53f426 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.15.20230313 +# version: 0.19.20240514 # -# REGENDATA ("0.15.20230313",["github","--config=cabal.haskell-ci","lattices.cabal"]) +# REGENDATA ("0.19.20240514",["github","--config=cabal.haskell-ci","lattices.cabal"]) # name: Haskell-CI on: @@ -27,24 +27,29 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.6.1 + - compiler: ghc-9.8.1 compilerKind: ghc - compilerVersion: 9.6.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.4 + - compiler: ghc-9.6.3 compilerKind: ghc - compilerVersion: 9.4.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.5 + - compiler: ghc-9.4.7 compilerKind: ghc - compilerVersion: 9.2.5 + compilerVersion: 9.4.7 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8 + compilerKind: ghc + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -55,47 +60,17 @@ jobs: - compiler: ghc-8.10.4 compilerKind: ghc compilerVersion: 8.10.4 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.8.3 compilerKind: ghc compilerVersion: 8.8.3 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.6.5 compilerKind: ghc compilerVersion: 8.6.5 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.4 - compilerKind: ghc - compilerVersion: 8.4.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.2.2 - compilerKind: ghc - compilerVersion: 8.2.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.0.2 - compilerKind: ghc - compilerVersion: 8.0.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.10.3 - compilerKind: ghc - compilerVersion: 7.10.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.8.4 - compilerKind: ghc - compilerVersion: 7.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.6.3 - compilerKind: ghc - compilerVersion: 7.6.3 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false fail-fast: false steps: @@ -103,21 +78,11 @@ jobs: run: | apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 - if [ "${{ matrix.setup-method }}" = ghcup ]; then - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - else - apt-add-repository -y 'ppa:hvr/ghc' - apt-get update - apt-get install -y "$HCNAME" - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - fi + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -129,20 +94,13 @@ jobs: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER - if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$HOME/.ghcup/bin/$HCKIND-$HCVER - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" - echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - else - HC=$HCDIR/bin/$HCKIND - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" - echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - fi - + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -190,15 +148,15 @@ jobs: run: | $CABAL v2-update -v - name: cache (tools) - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-4095ff06 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a326b3c0 path: ~/.haskell-ci-tools - name: install cabal-plan run: | mkdir -p $HOME/.cabal/bin - curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz - echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c - + curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz + echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan rm -f cabal-plan.xz chmod a+x $HOME/.cabal/bin/cabal-plan @@ -206,24 +164,24 @@ jobs: - name: install cabal-docspec run: | mkdir -p $HOME/.cabal/bin - curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20211114/cabal-docspec-0.0.0.20211114.xz > cabal-docspec.xz - echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c - + curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz + echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c - xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec rm -f cabal-docspec.xz chmod a+x $HOME/.cabal/bin/cabal-docspec cabal-docspec --version - name: install doctest run: | - if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi - if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi + if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0' ; fi + if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi - name: save cache (tools) - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: always() with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-4095ff06 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a326b3c0 path: ~/.haskell-ci-tools - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: source - name: initial cabal.project for sdist @@ -247,11 +205,11 @@ jobs: touch cabal.project touch cabal.project.local echo "packages: ${PKGDIR_lattices}" >> cabal.project - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package lattices" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + echo "package lattices" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(lattices)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -259,7 +217,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -279,8 +237,8 @@ jobs: $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - name: doctest run: | - if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_lattices} || false ; fi - if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi + if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_lattices} || false ; fi + if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi - name: docspec run: | $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all @@ -301,10 +259,12 @@ jobs: rm -f cabal.project.local - name: constraint set transformers-0.6 run: | + if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='transformers ^>=0.6' all --dry-run ; fi + if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then cabal-plan topo | sort ; fi if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='transformers ^>=0.6' --dependencies-only -j2 all ; fi if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='transformers ^>=0.6' all ; fi - name: save cache - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: always() with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a0d0ae..1f34f25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.2.1 (2024-05-16) + +- Support GHC-8.6.5..GHC-9.10.1 + # 2.2 (2022-03-15) - Drop `semigroupoids` dependency in favour of `foldable1-classes-compat`. diff --git a/cabal.project b/cabal.project index b0a523c..855de34 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1,6 @@ packages: . tests: true + +allow-newer: quickcheck-instances-0.3.30:base +allow-newer: quickcheck-instances-0.3.30:containers +allow-newer: these-1.2:base diff --git a/lattices.cabal b/lattices.cabal index 1d86970..278dec9 100644 --- a/lattices.cabal +++ b/lattices.cabal @@ -1,7 +1,6 @@ cabal-version: 1.18 name: lattices -version: 2.2 -x-revision: 1 +version: 2.2.1 category: Math license: BSD3 license-file: LICENSE @@ -23,13 +22,7 @@ extra-doc-files: wide.png tested-with: - GHC ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.3 || ==8.10.4 || ==9.0.2 @@ -85,13 +78,12 @@ library Algebra.PartialOrd.Instances build-depends: - base >=4.6 && <4.20 - , base-compat >=0.13 && <0.14 - , containers >=0.5.0.0 && <0.7 + base >=4.12 && <4.21 + , containers >=0.5.0.0 && <0.8 , deepseq >=1.3.0.0 && <1.6 , hashable >=1.2.7.0 && <1.5 , integer-logarithms >=1.0.3 && <1.1 - , QuickCheck >=2.12.6.1 && <2.15 + , QuickCheck >=2.12.6.1 && <2.16 , tagged >=0.8.6 && <0.9 , transformers >=0.3.0.0 && <0.7 , universe-base >=1.1 && <1.2 @@ -107,15 +99,6 @@ library else build-depends: OneTuple >=0.4 && <0.5 - if !impl(ghc >=8.0) - build-depends: semigroups >=0.18.5 && <0.21 - - if !impl(ghc >=7.10) - build-depends: void >=0.7.2 && <0.8 - - if impl(ghc >=7.4 && <7.5) - build-depends: ghc-prim - test-suite test type: exitcode-stdio-1.0 main-is: Tests.hs @@ -124,12 +107,11 @@ test-suite test default-language: Haskell2010 build-depends: base - , base-compat , containers , lattices , QuickCheck , quickcheck-instances >=0.3.19 && <0.4 - , tasty >=1.2.1 && <1.5 + , tasty >=1.2.1 && <1.6 , tasty-quickcheck >=0.10 && <0.11 , transformers , universe-base diff --git a/src/Algebra/Heyting.hs b/src/Algebra/Heyting.hs index afb507f..5a49637 100644 --- a/src/Algebra/Heyting.hs +++ b/src/Algebra/Heyting.hs @@ -12,9 +12,6 @@ ---------------------------------------------------------------------------- module Algebra.Heyting where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Control.Applicative (Const (..)) import Data.Functor.Identity (Identity (..)) diff --git a/src/Algebra/Heyting/Free.hs b/src/Algebra/Heyting/Free.hs index 8df47fd..29f3ca4 100644 --- a/src/Algebra/Heyting/Free.hs +++ b/src/Algebra/Heyting/Free.hs @@ -14,9 +14,6 @@ module Algebra.Heyting.Free ( toExpr, ) where -import Prelude () -import Prelude.Compat - import Algebra.Heyting import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Heyting/Free/Expr.hs b/src/Algebra/Heyting/Free/Expr.hs index 2ee61fe..24952fa 100644 --- a/src/Algebra/Heyting/Free/Expr.hs +++ b/src/Algebra/Heyting/Free/Expr.hs @@ -10,9 +10,6 @@ module Algebra.Heyting.Free.Expr ( proofSearch, ) where -import Prelude () -import Prelude.Compat - import Control.Monad (ap) import Control.Monad.Trans.State (State, evalState, get, put) import Data.Data (Data, Typeable) diff --git a/src/Algebra/Lattice.hs b/src/Algebra/Lattice.hs index 4fe8f2f..c6a7c24 100644 --- a/src/Algebra/Lattice.hs +++ b/src/Algebra/Lattice.hs @@ -40,9 +40,6 @@ module Algebra.Lattice ( gfp, gfpFrom, unsafeGfp, ) where -import Prelude () -import Prelude.Compat - import qualified Algebra.PartialOrd as PO import Control.Applicative (Const (..)) diff --git a/src/Algebra/Lattice/Divisibility.hs b/src/Algebra/Lattice/Divisibility.hs index b657eee..382894a 100644 --- a/src/Algebra/Lattice/Divisibility.hs +++ b/src/Algebra/Lattice/Divisibility.hs @@ -20,9 +20,6 @@ module Algebra.Lattice.Divisibility ( Divisibility(..) ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Dropped.hs b/src/Algebra/Lattice/Dropped.hs index df33f5f..d2acae0 100644 --- a/src/Algebra/Lattice/Dropped.hs +++ b/src/Algebra/Lattice/Dropped.hs @@ -22,9 +22,6 @@ module Algebra.Lattice.Dropped ( , foldDropped ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Free.hs b/src/Algebra/Lattice/Free.hs index 996dc80..096a723 100644 --- a/src/Algebra/Lattice/Free.hs +++ b/src/Algebra/Lattice/Free.hs @@ -14,9 +14,6 @@ module Algebra.Lattice.Free ( toExpr, ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Free/Final.hs b/src/Algebra/Lattice/Free/Final.hs index 4e3ea68..76d762a 100644 --- a/src/Algebra/Lattice/Free/Final.hs +++ b/src/Algebra/Lattice/Free/Final.hs @@ -24,9 +24,6 @@ module Algebra.Lattice.Free.Final ( retractFBoundedLattice, ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Data.Universe.Class (Finite (..), Universe (..)) diff --git a/src/Algebra/Lattice/Levitated.hs b/src/Algebra/Lattice/Levitated.hs index 3163e05..a89e2fe 100644 --- a/src/Algebra/Lattice/Levitated.hs +++ b/src/Algebra/Lattice/Levitated.hs @@ -22,9 +22,6 @@ module Algebra.Lattice.Levitated ( , foldLevitated ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Lexicographic.hs b/src/Algebra/Lattice/Lexicographic.hs index 338693b..f98564b 100644 --- a/src/Algebra/Lattice/Lexicographic.hs +++ b/src/Algebra/Lattice/Lexicographic.hs @@ -20,9 +20,6 @@ module Algebra.Lattice.Lexicographic ( Lexicographic(..) ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Lifted.hs b/src/Algebra/Lattice/Lifted.hs index fe96dd7..205559b 100644 --- a/src/Algebra/Lattice/Lifted.hs +++ b/src/Algebra/Lattice/Lifted.hs @@ -22,9 +22,6 @@ module Algebra.Lattice.Lifted ( , foldLifted ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/M2.hs b/src/Algebra/Lattice/M2.hs index 9754fe8..3be1745 100644 --- a/src/Algebra/Lattice/M2.hs +++ b/src/Algebra/Lattice/M2.hs @@ -16,9 +16,6 @@ module Algebra.Lattice.M2 ( fromSetBool, ) where -import Prelude () -import Prelude.Compat - import Control.DeepSeq (NFData (..)) import Data.Data (Data, Typeable) import Data.Hashable (Hashable (..)) diff --git a/src/Algebra/Lattice/M3.hs b/src/Algebra/Lattice/M3.hs index d314d52..82840ea 100644 --- a/src/Algebra/Lattice/M3.hs +++ b/src/Algebra/Lattice/M3.hs @@ -14,9 +14,6 @@ module Algebra.Lattice.M3 ( M3 (..), ) where -import Prelude () -import Prelude.Compat - import Control.DeepSeq (NFData (..)) import Data.Data (Data, Typeable) import Data.Hashable (Hashable (..)) diff --git a/src/Algebra/Lattice/N5.hs b/src/Algebra/Lattice/N5.hs index 7e4d005..cf17437 100644 --- a/src/Algebra/Lattice/N5.hs +++ b/src/Algebra/Lattice/N5.hs @@ -14,9 +14,6 @@ module Algebra.Lattice.N5 ( N5 (..), ) where -import Prelude () -import Prelude.Compat - import Control.DeepSeq (NFData (..)) import Data.Data (Data, Typeable) import Data.Hashable (Hashable (..)) diff --git a/src/Algebra/Lattice/Op.hs b/src/Algebra/Lattice/Op.hs index 185df03..ca4dd5d 100644 --- a/src/Algebra/Lattice/Op.hs +++ b/src/Algebra/Lattice/Op.hs @@ -19,9 +19,6 @@ module Algebra.Lattice.Op ( Op(..) ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Ordered.hs b/src/Algebra/Lattice/Ordered.hs index 3c1ac8b..d3a0d53 100644 --- a/src/Algebra/Lattice/Ordered.hs +++ b/src/Algebra/Lattice/Ordered.hs @@ -20,9 +20,6 @@ module Algebra.Lattice.Ordered ( Ordered(..) ) where -import Prelude () -import Prelude.Compat - import Algebra.Heyting import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/Wide.hs b/src/Algebra/Lattice/Wide.hs index 6e8f918..751502e 100644 --- a/src/Algebra/Lattice/Wide.hs +++ b/src/Algebra/Lattice/Wide.hs @@ -19,9 +19,6 @@ module Algebra.Lattice.Wide ( Wide(..) ) where -import Prelude () -import Prelude.Compat - import Algebra.Lattice import Algebra.PartialOrd diff --git a/src/Algebra/Lattice/ZeroHalfOne.hs b/src/Algebra/Lattice/ZeroHalfOne.hs index c35280f..473a2a6 100644 --- a/src/Algebra/Lattice/ZeroHalfOne.hs +++ b/src/Algebra/Lattice/ZeroHalfOne.hs @@ -14,9 +14,6 @@ module Algebra.Lattice.ZeroHalfOne ( ZeroHalfOne (..), ) where -import Prelude () -import Prelude.Compat - import Control.DeepSeq (NFData (..)) import Data.Data (Data, Typeable) import Data.Hashable (Hashable (..)) diff --git a/src/Algebra/PartialOrd.hs b/src/Algebra/PartialOrd.hs index edb91ad..a332942 100644 --- a/src/Algebra/PartialOrd.hs +++ b/src/Algebra/PartialOrd.hs @@ -24,7 +24,7 @@ import qualified Data.HashMap.Lazy as HM import qualified Data.HashSet as HS import qualified Data.IntMap as IM import qualified Data.IntSet as IS -import qualified Data.List.Compat as L +import qualified Data.List as L import qualified Data.Map as Map import Data.Monoid (All (..), Any (..)) import qualified Data.Set as Set diff --git a/test/Tests.hs b/test/Tests.hs index e6814d0..94afb24 100644 --- a/test/Tests.hs +++ b/test/Tests.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleContexts #-} @@ -7,9 +6,6 @@ {-# LANGUAGE ScopedTypeVariables #-} module Main (main) where -import Prelude () -import Prelude.Compat - import Control.Monad (ap, guard) import Data.Int (Int8) import Data.List (genericLength, nub) @@ -147,9 +143,6 @@ type OInt8 = O.Ordered Int8 ------------------------------------------------------------------------------- monadLaws :: forall (m :: * -> *). ( Monad m -#if !MIN_VERSION_base(4, 8, 0) - , Applicative m -#endif , Arbitrary (m Int) , Eq (m Int) , Show (m Int)