Reduced CPP usage to minimum

LaurentRDC · LaurentRDC · commit 61e80c364119 · 2026-06-07T14:59:24.000+02:00
diff --git a/beam-core/Database/Beam/Backend/SQL/Builder.hs b/beam-core/Database/Beam/Backend/SQL/Builder.hs
@@ -1,5 +1,4 @@
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 
diff --git a/beam-core/Database/Beam/Backend/SQL/Row.hs b/beam-core/Database/Beam/Backend/SQL/Row.hs
@@ -1,7 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE PolyKinds #-}
@@ -86,9 +85,7 @@ instance Alternative (FromBackendRowM be) where
     FromBackendRowM (liftF (Alt a b id))
 
 parseOneField :: (BackendFromField be a, Typeable a) => FromBackendRowM be a
-parseOneField = do
-  x <- FromBackendRowM (liftF (ParseOneField id))
-  pure x
+parseOneField = FromBackendRowM (liftF (ParseOneField id))
 
 peekField :: (Typeable a, BackendFromField be a) => FromBackendRowM be (Maybe a)
 peekField = fmap Just (FromBackendRowM (liftF (ParseOneField id))) <|> pure Nothing
diff --git a/beam-core/Database/Beam/Backend/URI.hs b/beam-core/Database/Beam/Backend/URI.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- | Convenience methods for constructing backend-agnostic applications
 module Database.Beam.Backend.URI where
 
diff --git a/beam-core/Database/Beam/Query/CTE.hs b/beam-core/Database/Beam/Query/CTE.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 module Database.Beam.Query.CTE where
 
diff --git a/beam-core/Database/Beam/Query/Combinators.hs b/beam-core/Database/Beam/Query/Combinators.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 module Database.Beam.Query.Combinators
diff --git a/beam-core/Database/Beam/Query/CustomSQL.hs b/beam-core/Database/Beam/Query/CustomSQL.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 -- | Allows the creation of custom SQL expressions from arbitrary string-like values.
 --
diff --git a/beam-core/Database/Beam/Query/SQL92.hs b/beam-core/Database/Beam/Query/SQL92.hs
@@ -1,7 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-name-shadowing -fno-warn-unused-binds #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE CPP #-}
 
 module Database.Beam.Query.SQL92
     ( buildSql92Query' ) where
diff --git a/beam-core/Database/Beam/Schema/Tables.hs b/beam-core/Database/Beam/Schema/Tables.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE TypeApplications #-}
diff --git a/beam-migrate/ChangeLog.md b/beam-migrate/ChangeLog.md
@@ -1,3 +1,11 @@
+# 0.6.1.0
+
+## Updated dependencies
+
+* Tightened bounds on `haskell-src-exts`, with a minimum version of 1.23.
+* Tightened bounds on `hashable`, with a minimum version of 1.4.
+* Tightened bounds on `aeson`, with a minimum of version 2.0.
+
 # 0.6.0.0
 
 ## Interface changes
diff --git a/beam-migrate/Database/Beam/Haskell/Syntax.hs b/beam-migrate/Database/Beam/Haskell/Syntax.hs
@@ -1,6 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE CPP #-}
 
 -- | Instances that allow us to use Haskell as a backend syntax. This allows us
 -- to use migrations defined a la 'Database.Beam.Migrate.SQL' to generate a beam
@@ -209,33 +208,21 @@ entityDbFieldName entity = "_" ++ getHsEntityName (hsEntityName entity)
 
 derivingDecl :: [Hs.InstRule ()] -> Hs.Deriving ()
 derivingDecl =
-#if MIN_VERSION_haskell_src_exts(1,20,0)
   Hs.Deriving () Nothing
-#else
-  Hs.Deriving ()
-#endif
 
 dataDecl :: Hs.DeclHead ()
          -> [Hs.QualConDecl ()]
          -> Maybe (Hs.Deriving ())
          -> Hs.Decl ()
 dataDecl declHead cons deriving_ =
-#if MIN_VERSION_haskell_src_exts(1,20,0)
   Hs.DataDecl () (Hs.DataType ()) Nothing declHead cons (maybeToList deriving_)
-#else
-  Hs.DataDecl () (Hs.DataType ()) Nothing declHead cons deriving_
-#endif
 
 insDataDecl :: Hs.Type ()
             -> [Hs.QualConDecl ()]
             -> Maybe (Hs.Deriving ())
             -> Hs.InstDecl ()
 insDataDecl declHead cons deriving_ =
-#if MIN_VERSION_haskell_src_exts(1,20,0)
    Hs.InsData () (Hs.DataType ()) declHead cons (maybeToList deriving_)
-#else
-   Hs.InsData () (Hs.DataType ()) declHead cons deriving_
-#endif
 
 databaseTypeDecl :: [ HsEntity ] -> Hs.Decl ()
 databaseTypeDecl entities =
@@ -950,11 +937,7 @@ hsInstance classNm params decls =
 
 hsDerivingInstance :: T.Text -> [ Hs.Type () ] -> Hs.Decl ()
 hsDerivingInstance classNm params =
-#if MIN_VERSION_haskell_src_exts(1,20,0)
   Hs.DerivDecl () Nothing Nothing (Hs.IRule () Nothing Nothing instHead)
-#else
-  Hs.DerivDecl () Nothing (Hs.IRule () Nothing Nothing instHead)
-#endif
   where
     instHead = foldl (Hs.IHApp ()) (Hs.IHCon () (Hs.UnQual () (Hs.Ident () (T.unpack classNm)))) params
 
@@ -974,11 +957,7 @@ inst = Hs.IRule () Nothing Nothing . Hs.IHCon () . Hs.UnQual () . Hs.Ident ()
 beamMigrateSqlBackend :: HsBackendConstraint
 beamMigrateSqlBackend =
   HsBackendConstraint $ \beTy ->
-#if MIN_VERSION_haskell_src_exts(1, 22, 0)
   Hs.TypeA () (Hs.TyApp () (Hs.TyCon () (Hs.UnQual () (Hs.Ident () "BeamMigrateSqlBackend"))) beTy)
-#else
-  Hs.ClassA () (Hs.UnQual () (Hs.Ident () "BeamMigrateSqlBackend")) [ beTy ]
-#endif
 
 
 
@@ -991,12 +970,9 @@ instance Hashable (Hs.IPName ())
 instance Hashable (Hs.Asst ())
 instance Hashable (Hs.Literal ())
 instance Hashable (Hs.Name ())
-instance Hashable (Hs.Type ())
 instance Hashable (Hs.QOp ())
 instance Hashable (Hs.TyVarBind ())
-#if !MIN_VERSION_haskell_src_exts(1, 21, 0)
 instance Hashable (Hs.Kind ())
-#endif
 instance Hashable (Hs.Context ())
 instance Hashable (Hs.SpecialCon ())
 instance Hashable (Hs.Pat ())
@@ -1053,11 +1029,5 @@ instance Hashable (Hs.BangType ())
 instance Hashable (Hs.ImportSpec ())
 instance Hashable (Hs.Namespace ())
 instance Hashable (Hs.CName ())
-#if MIN_VERSION_haskell_src_exts(1,20,0)
 instance Hashable (Hs.DerivStrategy ())
 instance Hashable (Hs.MaybePromotedName ())
-#endif
-#if !MIN_VERSION_hashable(1, 3, 4)
-instance Hashable a => Hashable (S.Set a) where
-  hashWithSalt s a = hashWithSalt s (S.toList a)
-#endif
diff --git a/beam-migrate/Database/Beam/Migrate/Actions.hs b/beam-migrate/Database/Beam/Migrate/Actions.hs
@@ -1,11 +1,8 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 -- | Data types and functions to discover sequences of DDL commands to go from
diff --git a/beam-migrate/Database/Beam/Migrate/Backend.hs b/beam-migrate/Database/Beam/Migrate/Backend.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE CPP #-}
 
 -- | Definitions of interest to those implement a new beam backend.
 --
diff --git a/beam-migrate/Database/Beam/Migrate/SQL/Builder.hs b/beam-migrate/Database/Beam/Migrate/SQL/Builder.hs
@@ -1,5 +1,4 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE CPP #-}
 
 -- | DDL syntax instances for 'SqlSyntaxBuilder'
 module Database.Beam.Migrate.SQL.Builder where
diff --git a/beam-migrate/Database/Beam/Migrate/SQL/SQL92.hs b/beam-migrate/Database/Beam/Migrate/SQL/SQL92.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE CPP #-}
 
 -- | Finally-tagless encoding of SQL92 DDL commands.
 --
diff --git a/beam-migrate/Database/Beam/Migrate/Serialization.hs b/beam-migrate/Database/Beam/Migrate/Serialization.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE CPP #-}
 
 -- | Serialization and deserialization helpers for beam data types.
 --
@@ -40,9 +39,7 @@ import           Control.Applicative
 import           Control.Monad
 
 import           Data.Aeson
-#if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.Key as DAK
-#endif
 import           Data.Aeson.Types (Parser)
 import qualified Data.Dependent.Map as D
 import qualified Data.GADT.Compare as D
@@ -331,13 +328,8 @@ sql92Deserializers = mconcat
                    , beamDeserializer deserializeSql92ReferentialAction
                    , beamDeserializer deserializeSql92Attributes ]
   where
-#if MIN_VERSION_aeson(2,0,0)
-    makeKey = DAK.fromText
-#else
-    makeKey = id
-#endif
     parseSub nm o key parse =
-      withObject (unpack (nm <> "." <> key)) parse =<< o .: makeKey key
+      withObject (unpack (nm <> "." <> key)) parse =<< o .: DAK.fromText key
 
     deserializeSql92DataType :: BeamDeserializers be' -> Value
                              -> Parser (BeamSqlBackendDataTypeSyntax be)
diff --git a/beam-migrate/Database/Beam/Migrate/Types.hs b/beam-migrate/Database/Beam/Migrate/Types.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 module Database.Beam.Migrate.Types
   ( -- * Checked database entities
diff --git a/beam-migrate/Database/Beam/Migrate/Types/Predicates.hs b/beam-migrate/Database/Beam/Migrate/Types/Predicates.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- | Common 'DatabasePredicate's used for defining schemas
 module Database.Beam.Migrate.Types.Predicates where
 
diff --git a/beam-migrate/beam-migrate.cabal b/beam-migrate/beam-migrate.cabal
@@ -1,5 +1,5 @@
 name:                beam-migrate
-version:             0.6.0.0
+version:             0.6.1.0
 synopsis:            SQL DDL support and migrations support library for Beam
 description:         This package provides type classes to allow backends to implement
                      SQL DDL support for beam. This allows you to use beam syntax to
@@ -58,7 +58,7 @@ library
   build-depends:       base                 >=4.11    && <5.0,
                        beam-core            >=0.11    && <0.12,
                        text                 >=1.2     && <2.2,
-                       aeson                >=0.11    && <2.4,
+                       aeson                >=2.0     && <2.4,
                        bytestring           >=0.10    && <0.13,
                        free                 >=4.12    && <5.3,
                        time                 >=1.6     && <1.17,
@@ -67,11 +67,11 @@ library
                        vector               >=0.11    && <0.14,
                        containers           >=0.5     && <0.9,
                        unordered-containers >=0.2     && <0.3,
-                       hashable             >=1.2     && <1.6,
+                       hashable             >=1.4     && <1.6,
                        microlens            >=0.4     && <0.6,
                        parallel             >=3.2     && <3.4,
                        deepseq              >=1.4     && <1.7,
-                       haskell-src-exts     >=1.18    && <1.24,
+                       haskell-src-exts     >=1.23    && <1.24,
                        pretty               >=1.1     && <1.2,
                        dependent-map        >=0.2     && <0.5,
                        dependent-sum        >=0.4     && <0.8,
diff --git a/beam-postgres/Database/Beam/Postgres/Connection.hs b/beam-postgres/Database/Beam/Postgres/Connection.hs
@@ -9,7 +9,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
 
 module Database.Beam.Postgres.Connection
diff --git a/beam-postgres/Database/Beam/Postgres/Extensions.hs b/beam-postgres/Database/Beam/Postgres/Extensions.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE CPP #-}
 
 -- | Postgres extensions are run-time loadable plugins that can extend Postgres
 -- functionality. Extensions are part of the database schema.
diff --git a/beam-postgres/Database/Beam/Postgres/Full.hs b/beam-postgres/Database/Beam/Postgres/Full.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TypeOperators #-}
 
diff --git a/beam-postgres/Database/Beam/Postgres/Migrate.hs b/beam-postgres/Database/Beam/Postgres/Migrate.hs
@@ -60,7 +60,7 @@ import           Control.Arrow
 import           Control.Exception.Lifted (mask, onException)
 import           Control.Monad
 
-import           Data.Aeson hiding (json)
+import           Data.Aeson
 import           Data.Bits
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy as BL
diff --git a/beam-postgres/Database/Beam/Postgres/PgSpecific.hs b/beam-postgres/Database/Beam/Postgres/PgSpecific.hs
@@ -9,7 +9,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE CPP #-}
 
 -- | Postgres-specific types, functions, and operators
 module Database.Beam.Postgres.PgSpecific
diff --git a/beam-postgres/Database/Beam/Postgres/Types.hs b/beam-postgres/Database/Beam/Postgres/Types.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
diff --git a/beam-postgres/beam-postgres.cabal b/beam-postgres/beam-postgres.cabal
@@ -67,7 +67,7 @@ library
   default-language:   Haskell2010
   default-extensions: ScopedTypeVariables, OverloadedStrings, MultiParamTypeClasses, RankNTypes, FlexibleInstances,
                       DeriveDataTypeable, DeriveGeneric, StandaloneDeriving, TypeFamilies, GADTs, OverloadedStrings,
-                      CPP, TypeApplications, FlexibleContexts
+                      TypeApplications, FlexibleContexts
   ghc-options:        -Wall
                       -Widentities
                       -Wincomplete-uni-patterns
@@ -97,7 +97,7 @@ test-suite beam-postgres-tests
     beam-migrate,
     beam-postgres,
     bytestring,
-    hedgehog,
+    hedgehog >= 1.0,
     postgresql-simple,
     tasty-hunit,
     tasty,
diff --git a/beam-postgres/test/Database/Beam/Postgres/Test.hs b/beam-postgres/test/Database/Beam/Postgres/Test.hs
@@ -1,10 +1,5 @@
-{-# LANGUAGE CPP #-}
 module Database.Beam.Postgres.Test where
 
-#if MIN_VERSION_base(4,12,0)
-import           Prelude hiding (fail)
-#endif
-
 import qualified Database.PostgreSQL.Simple as Pg
 
 import           Control.Exception (bracket)
@@ -14,18 +9,6 @@ import           Control.Monad (void)
 import           Data.ByteString (ByteString)
 import           Data.String
 
-#if MIN_VERSION_base(4,12,0)
-#if !MIN_VERSION_hedgehog(1,0,0)
-import           Control.Monad.Fail (MonadFail(..))
-import qualified Hedgehog
--- TODO orphan instances are bad
--- Would be easier to say 'build-depends: hedgehog >= 1.0',
--- but it's difficult to propagate to older Stackage snapshots
-instance Monad m => MonadFail (Hedgehog.PropertyT m) where
-    fail _ = Hedgehog.failure
-#endif
-#endif
-
 withTestPostgres :: String -> IO ByteString -> (Pg.Connection -> IO a) -> IO a
 withTestPostgres dbName getConnStr action = do
   connStr <- getConnStr
diff --git a/beam-sqlite/Database/Beam/Sqlite/Connection.hs b/beam-sqlite/Database/Beam/Sqlite/Connection.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE InstanceSigs #-}
 {-# LANGUAGE UndecidableInstances #-}
diff --git a/beam-sqlite/Database/Beam/Sqlite/Syntax.hs b/beam-sqlite/Database/Beam/Sqlite/Syntax.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE CPP #-}
 
 -- | SQLite implementations of the Beam SQL syntax classes
 --
diff --git a/beam-sqlite/beam-sqlite.cabal b/beam-sqlite/beam-sqlite.cabal
@@ -50,7 +50,7 @@ library
   default-language:   Haskell2010
   default-extensions: ScopedTypeVariables, OverloadedStrings, MultiParamTypeClasses, RankNTypes, FlexibleInstances,
                       DeriveDataTypeable, DeriveGeneric, StandaloneDeriving, TypeFamilies, GADTs, OverloadedStrings,
-                      CPP, TypeApplications, FlexibleContexts, ConstraintKinds, DerivingStrategies
+                      TypeApplications, FlexibleContexts, ConstraintKinds, DerivingStrategies
   ghc-options:        -Wall
                       -Widentities
                       -Wincomplete-uni-patterns

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# OPTIONS_GHC -fno-warn-name-shadowing #-}`
`2`		`-{-# LANGUAGE CPP #-}`
`3`	`2`	`{-# LANGUAGE PolyKinds #-}`
`4`	`3`	`{-# LANGUAGE UndecidableInstances #-}`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-{-# LANGUAGE CPP #-}`
`2`		`-`
`3`	`1`	`-- \| Convenience methods for constructing backend-agnostic applications`
`4`	`2`	`module Database.Beam.Backend.URI where`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# LANGUAGE CPP #-}`
`2`	`1`	`{-# LANGUAGE UndecidableInstances #-}`
`3`	`2`
`4`	`3`	`module Database.Beam.Query.Combinators`