Make it build with ghc 9.10 (#1536)

* Make it build with ghc 9.10 * CI: Add ghc-9.10 to the build matrix
yesodweb · Jul 19, 2024 · 201a1b9 · 201a1b9
1 parent a4b4890
commit 201a1b9
Show file tree

Hide file tree

Showing 61 changed files with 76 additions and 19 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cabal: ["3.8"]
+        cabal: ["3.10"]
         ghc:
           - "8.4.4"
           - "8.6.5"
@@ -54,9 +54,10 @@ jobs:
           - "9.0.2"
           - "9.2.7"
           - "9.4.5"
+          - "9.6.5"
         include:
-        - ghc: "9.6.1"
-          cabal: "3.10"
+        - ghc: "9.10.1"
+          cabal: "3.12"
 
     env:
       CONFIG: "--enable-tests --enable-benchmarks"

diff --git a/cabal.project b/cabal.project
@@ -17,6 +17,7 @@ constraints:
 -- These need hackage revisions but otherwise test fine in the repo
 allow-newer:
     -- https://github.com/haskellari/postgresql-simple/pull/95
+    -- https://github.com/haskellari/postgresql-simple/issues/139
    , postgresql-simple:base
    , postgresql-simple:template-haskell
 

diff --git a/persistent-mongoDB/Database/Persist/MongoDB.hs b/persistent-mongoDB/Database/Persist/MongoDB.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -fno-warn-deprecations #-} -- Pattern match 'PersistDbSpecific'
 -- | Use persistent-mongodb the same way you would use other persistent

diff --git a/persistent-mongoDB/test/EmbedTestMongo.hs b/persistent-mongoDB/test/EmbedTestMongo.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-orphans -O0 #-}
 module EmbedTestMongo (specs) where

diff --git a/persistent-mongoDB/test/main.hs b/persistent-mongoDB/test/main.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-mysql/Database/Persist/MySQL.hs b/persistent-mysql/Database/Persist/MySQL.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 
 {-# OPTIONS_GHC -fno-warn-deprecations #-} -- Pattern match 'PersistDbSpecific'

diff --git a/persistent-mysql/test/InsertDuplicateUpdate.hs b/persistent-mysql/test/InsertDuplicateUpdate.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 
 module InsertDuplicateUpdate where
 

diff --git a/persistent-mysql/test/main.hs b/persistent-mysql/test/main.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}

diff --git a/persistent-postgresql/Database/Persist/Postgresql.hs b/persistent-postgresql/Database/Persist/Postgresql.hs
@@ -13,6 +13,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 
 #if MIN_VERSION_base(4,12,0)
@@ -107,7 +108,7 @@ import Data.Either (partitionEithers)
 import Data.Function (on)
 import Data.Int (Int64)
 import Data.IORef
-import Data.List (find, foldl', groupBy, sort)
+import Data.List as List (find, foldl', groupBy, sort)
 import qualified Data.List as List
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.Map as Map
@@ -845,7 +846,7 @@ getColumns getter def cols = do
     refMap =
         fmap (\cr -> (crTableName cr, crConstraintName cr))
         $ Map.fromList
-        $ foldl' ref [] cols
+        $ List.foldl' ref [] cols
       where
         ref rs c =
             maybe rs (\r -> (unFieldNameDB $ cName c, r) : rs) (cReference c)

diff --git a/persistent-postgresql/test/ArrayAggTest.hs b/persistent-postgresql/test/ArrayAggTest.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-} -- FIXME
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE DerivingStrategies #-}

diff --git a/persistent-postgresql/test/EquivalentTypeTestPostgres.hs b/persistent-postgresql/test/EquivalentTypeTestPostgres.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 
 module EquivalentTypeTestPostgres (specs) where

diff --git a/persistent-postgresql/test/ImplicitUuidSpec.hs b/persistent-postgresql/test/ImplicitUuidSpec.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 module ImplicitUuidSpec where

diff --git a/persistent-postgresql/test/PgIntervalTest.hs b/persistent-postgresql/test/PgIntervalTest.hs
@@ -11,6 +11,7 @@
 {-# LANGUAGE DerivingStrategies         #-}
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE DeriveAnyClass             #-}
+{-# LANGUAGE TypeOperators              #-}
 
 module PgIntervalTest where
 

diff --git a/persistent-postgresql/test/UpsertWhere.hs b/persistent-postgresql/test/UpsertWhere.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 module UpsertWhere where

diff --git a/persistent-postgresql/test/main.hs b/persistent-postgresql/test/main.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-redis/persistent-redis.cabal b/persistent-redis/persistent-redis.cabal
@@ -21,7 +21,7 @@ library
                    , persistent            >= 2.12      && < 3.0
                    , aeson                 >= 1.0
                    , binary                >= 0.8      && < 0.9
-                   , bytestring            >= 0.10.8   && < 0.12
+                   , bytestring            >= 0.10.8   && < 0.13
                    , hedis                 >= 0.9
                    , http-api-data
                    , mtl                   >= 2.2.1    && < 2.4

diff --git a/persistent-redis/tests/basic-test.hs b/persistent-redis/tests/basic-test.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE TypeSynonymInstances       #-}
 {-# LANGUAGE UndecidableInstances       #-}
 module Main where

diff --git a/persistent-sqlite/test/main.hs b/persistent-sqlite/test/main.hs
@@ -12,6 +12,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
 

diff --git a/persistent-test/src/CompositeTest.hs b/persistent-test/src/CompositeTest.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-} -- FIXME
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 module CompositeTest where

diff --git a/persistent-test/src/CustomPersistFieldTest.hs b/persistent-test/src/CustomPersistFieldTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module CustomPersistFieldTest (specsWith, customFieldMigrate) where
 

diff --git a/persistent-test/src/CustomPrimaryKeyReferenceTest.hs b/persistent-test/src/CustomPrimaryKeyReferenceTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421
 -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.

diff --git a/persistent-test/src/DataTypeTest.hs b/persistent-test/src/DataTypeTest.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module DataTypeTest
     ( specsWith

diff --git a/persistent-test/src/EmbedOrderTest.hs b/persistent-test/src/EmbedOrderTest.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where

diff --git a/persistent-test/src/EmbedTest.hs b/persistent-test/src/EmbedTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-orphans -O0 #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module EmbedTest (specsWith, cleanDB, embedMigrate) where

diff --git a/persistent-test/src/EmptyEntityTest.hs b/persistent-test/src/EmptyEntityTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module EmptyEntityTest (specsWith, migration, cleanDB) where
 

diff --git a/persistent-test/src/EntityEmbedTest.hs b/persistent-test/src/EntityEmbedTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 module EntityEmbedTest where
 
 -- because we are using a type alias we need to declare in a separate module

diff --git a/persistent-test/src/EquivalentTypeTest.hs b/persistent-test/src/EquivalentTypeTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-test/src/ForeignKey.hs b/persistent-test/src/ForeignKey.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE AllowAmbiguousTypes, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ScopedTypeVariables, TypeApplications, UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 
 module ForeignKey where
 

diff --git a/persistent-test/src/GeneratedColumnTestSQL.hs b/persistent-test/src/GeneratedColumnTestSQL.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module GeneratedColumnTestSQL (specsWith) where

diff --git a/persistent-test/src/HtmlTest.hs b/persistent-test/src/HtmlTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DataKinds, UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module HtmlTest (specsWith, cleanDB, htmlMigrate) where
 

diff --git a/persistent-test/src/Init.hs b/persistent-test/src/Init.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 

diff --git a/persistent-test/src/LargeNumberTest.hs b/persistent-test/src/LargeNumberTest.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module LargeNumberTest where
 

diff --git a/persistent-test/src/LongIdentifierTest.hs b/persistent-test/src/LongIdentifierTest.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module LongIdentifierTest where
 

diff --git a/persistent-test/src/MaxLenTest.hs b/persistent-test/src/MaxLenTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 
 module MaxLenTest (specsWith, maxlenMigrate) where

diff --git a/persistent-test/src/MaybeFieldDefsTest.hs b/persistent-test/src/MaybeFieldDefsTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-test/src/MigrationColumnLengthTest.hs b/persistent-test/src/MigrationColumnLengthTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module MigrationColumnLengthTest where
 

diff --git a/persistent-test/src/MigrationIdempotencyTest.hs b/persistent-test/src/MigrationIdempotencyTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module MigrationIdempotencyTest where
 

diff --git a/persistent-test/src/MigrationOnlyTest.hs b/persistent-test/src/MigrationOnlyTest.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeApplications, UndecidableInstances #-}
+{-# LANGUAGE TypeApplications, TypeOperators, UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-test/src/MigrationTest.hs b/persistent-test/src/MigrationTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module MigrationTest where
 

diff --git a/persistent-test/src/PersistUniqueTest.hs b/persistent-test/src/PersistUniqueTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module PersistUniqueTest where
 

diff --git a/persistent-test/src/PersistentTest.hs b/persistent-test/src/PersistentTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE RecordWildCards, UndecidableInstances #-}
 
 module PersistentTest

diff --git a/persistent-test/src/PersistentTestModels.hs b/persistent-test/src/PersistentTestModels.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-} -- FIXME
 
 {-# OPTIONS_GHC -ddump-splices #-}

diff --git a/persistent-test/src/PersistentTestModelsImports.hs b/persistent-test/src/PersistentTestModelsImports.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeOperators #-}
 {-# language UndecidableInstances #-}
 
 -- | this just needs to compile

diff --git a/persistent-test/src/PrimaryTest.hs b/persistent-test/src/PrimaryTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE DeriveGeneric #-}
 

diff --git a/persistent-test/src/RawSqlTest.hs b/persistent-test/src/RawSqlTest.hs
@@ -1,4 +1,5 @@
 {-# language ScopedTypeVariables, DataKinds #-}
+{-# LANGUAGE TypeOperators #-}
 
 module RawSqlTest where
 

diff --git a/persistent-test/src/Recursive.hs b/persistent-test/src/Recursive.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE TypeOperators #-}
 
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-test/src/RenameTest.hs b/persistent-test/src/RenameTest.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeApplications, UndecidableInstances #-}
+{-# LANGUAGE TypeApplications, TypeOperators, UndecidableInstances #-}
 
 module RenameTest where
 

diff --git a/persistent-test/src/SumTypeTest.hs b/persistent-test/src/SumTypeTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module SumTypeTest (specsWith, sumTypeMigrate) where

diff --git a/persistent-test/src/TransactionLevelTest.hs b/persistent-test/src/TransactionLevelTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 module TransactionLevelTest where

diff --git a/persistent-test/src/TreeTest.hs b/persistent-test/src/TreeTest.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE RecordWildCards, UndecidableInstances #-}
+{-# LANGUAGE RecordWildCards, TypeOperators, UndecidableInstances #-}
 
 module TreeTest where
 

diff --git a/persistent-test/src/TypeLitFieldDefsTest.hs b/persistent-test/src/TypeLitFieldDefsTest.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 

diff --git a/persistent-test/src/UniqueTest.hs b/persistent-test/src/UniqueTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 module UniqueTest where
 

diff --git a/persistent/Database/Persist/Class/PersistConfig.hs b/persistent/Database/Persist/Class/PersistConfig.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Database.Persist.Class.PersistConfig
     ( PersistConfig (..)