Merge pull request #526 from well-typed/default-extensions

phadej · web-flow · commit 0dd731484e01 · 2025-07-22T21:33:58.000+03:00
Add DataKinds and PolyKinds to default-extensions
diff --git a/optics-core/optics-core.cabal b/optics-core/optics-core.cabal
@@ -40,8 +40,12 @@ common language
 
     default-language:   Haskell2010
 
+    if impl(ghc < 8.6)
+      default-extensions: TypeInType
+
     default-extensions: BangPatterns
                         ConstraintKinds
+                        DataKinds
                         DefaultSignatures
                         DeriveFoldable
                         DeriveFunctor
@@ -58,6 +62,7 @@ common language
                         LambdaCase
                         OverloadedLabels
                         PatternSynonyms
+                        PolyKinds
                         RankNTypes
                         ScopedTypeVariables
                         TupleSections
diff --git a/optics-core/src/Data/Tuple/Optics.hs b/optics-core/src/Data/Tuple/Optics.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE DataKinds #-}
 -- |
 -- Module: Data.Tuple.Optics
 -- Description: 'Lens'es for tuple types.
diff --git a/optics-core/src/Optics/At/Core.hs b/optics-core/src/Optics/At/Core.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE TypeInType #-}
 -- |
 -- Module: Optics.At.Core
 -- Description: Optics for 'Map' and 'Set'-like containers.
diff --git a/optics-core/src/Optics/Generic.hs b/optics-core/src/Optics/Generic.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 -- |
 -- Module: Optics.Generic
diff --git a/optics-core/src/Optics/Indexed/Core.hs b/optics-core/src/Optics/Indexed/Core.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE DataKinds #-}
 -- |
 -- Module: Optics.Indexed.Core
 -- Description: Core definitions for indexed optics.
diff --git a/optics-core/src/Optics/Internal/Generic.hs b/optics-core/src/Optics/Internal/Generic.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Generic/TypeLevel.hs b/optics-core/src/Optics/Internal/Generic/TypeLevel.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Indexed.hs b/optics-core/src/Optics/Internal/Indexed.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Magic.hs b/optics-core/src/Optics/Internal/Magic.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Optic.hs b/optics-core/src/Optics/Internal/Optic.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
 -- | Core optic types and subtyping machinery.
diff --git a/optics-core/src/Optics/Internal/Optic/Subtyping.hs b/optics-core/src/Optics/Internal/Optic/Subtyping.hs
@@ -1,6 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Optic/TypeLevel.hs b/optics-core/src/Optics/Internal/Optic/TypeLevel.hs
@@ -1,6 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
diff --git a/optics-core/src/Optics/Internal/Optic/Types.hs b/optics-core/src/Optics/Internal/Optic/Types.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
 -- | This module is intended for internal use only, and may change without
diff --git a/optics-core/src/Optics/IxFold.hs b/optics-core/src/Optics/IxFold.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE DataKinds #-}
 -- |
 -- Module: Optics.IxFold
 -- Description: An indexed version of a 'Optics.Fold.Fold'.
diff --git a/optics-core/src/Optics/IxTraversal.hs b/optics-core/src/Optics/IxTraversal.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE DataKinds #-}
 -- |
 -- Module: Optics.IxTraversal
 -- Description: An indexed version of a 'Optics.Traversal.Traversal'.
diff --git a/optics-core/src/Optics/Label.hs b/optics-core/src/Optics/Label.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 -- |
diff --git a/optics-core/src/Optics/Mapping.hs b/optics-core/src/Optics/Mapping.hs
@@ -6,7 +6,6 @@
 -- @'Optic'' ('MappedOptic' k) 'NoIx' (f s) (f a)@, in other words optic operating on values
 -- in a 'Functor'.
 --
-{-# LANGUAGE DataKinds #-}
 module Optics.Mapping
   ( MappingOptic (..)
   ) where
diff --git a/optics-core/src/Optics/Re.hs b/optics-core/src/Optics/Re.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeFamilyDependencies #-}
 -- |
 -- Module: Optics.Re
 -- Description: The 're' operator allows some optics to be reversed.
@@ -22,8 +23,6 @@
 --
 -- <<diagrams/reoptics.png Reversed Optics>>
 --
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilyDependencies #-}
 module Optics.Re
   ( ReversibleOptic(..)
   ) where
diff --git a/optics-core/src/Optics/ReadOnly.hs b/optics-core/src/Optics/ReadOnly.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeInType #-}
 -- |
 -- Module: Optics.ReadOnly
 -- Description: Converting read-write optics into their read-only counterparts.
diff --git a/optics-core/src/Optics/Traversal.hs b/optics-core/src/Optics/Traversal.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 -- |
 -- Module: Optics.Traversal

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# LANGUAGE DataKinds #-}`
`2`	`1`	`-- \|`
`3`	`2`	`-- Module: Data.Tuple.Optics`
`4`	`3`	`-- Description: 'Lens'es for tuple types.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# LANGUAGE CPP #-}`
`2`		`-{-# LANGUAGE TypeInType #-}`
`3`	`2`	`-- \|`
`4`	`3`	`-- Module: Optics.At.Core`
`5`	`4`	`-- Description: Optics for 'Map' and 'Set'-like containers.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# LANGUAGE AllowAmbiguousTypes #-}`
`2`		`-{-# LANGUAGE DataKinds #-}`
`3`	`2`	`{-# LANGUAGE UndecidableInstances #-}`
`4`	`3`	`-- \|`
`5`	`4`	`-- Module: Optics.Generic`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-{-# LANGUAGE DataKinds #-}`
`2`		`-{-# LANGUAGE PolyKinds #-}`
`3`	`1`	`{-# LANGUAGE UndecidableInstances #-}`
`4`	`2`	`{-# OPTIONS_HADDOCK not-home #-}`
`5`	`3`