Merge pull request #41 from jhrcek/jhrcek/ghc-9.12

Add more GHCs to CI config, fix hlint warnings and haddock links

Author: fumieval

.github/workflows/haskell.yml

@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: [ '8.10.7', '9.0.1', '9.2.1', '9.10.1' ]
+        ghc: [ '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.1', '9.12.2']
     steps:
-    - uses: actions/checkout@v2
-    - uses: haskell-actions/setup@v2.7.6
+    - uses: actions/checkout@v4
+    - uses: haskell-actions/setup@v2.7.10
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.12'
+        cabal-version: '3.14'
 
     - name: cabal Cache
       uses: actions/cache@v3

examples/getopt.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedLabels, LambdaCase #-}
+{-# LANGUAGE OverloadedLabels #-}
 import Control.Lens
 import Data.Extensible
 import Data.Extensible.GetOpt

examples/nullable.hs

@@ -12,8 +12,8 @@ defaultConfig = #columns @= 80 <: #language_extensions @= [] <: nil
 main :: IO ()
 main = do
   config <- hzipWith fromNullable defaultConfig <$> readConfig "path/to/config.json"
-  putStrLn $ "columns: " ++ (show $ config ^. #columns)
-  putStrLn $ "language_extensions: " ++ (show $ config ^. #language_extensions)
+  putStrLn $ "columns: " ++ show (config ^. #columns)
+  putStrLn $ "language_extensions: " ++ show (config ^. #language_extensions)
 
 -- dummy
 readConfig :: FilePath -> IO (ConfigRec :& Nullable (Field Identity))

examples/records.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell, DataKinds, TypeOperators, TypeFamilies, FlexibleContexts, OverloadedLabels #-}
+{-# LANGUAGE DataKinds, TypeOperators, TypeFamilies, FlexibleContexts, OverloadedLabels #-}
 import Data.Extensible
 import Control.Lens
 

extensible-skeleton/src/Data/Extensible/Effect/Default.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE MultiParamTypeClasses, UndecidableInstances #-}
-{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -117,7 +116,7 @@ instance (Monoid e, Lookup xs "Either" (Const e)) => MonadPlus (Eff xs) where
 pCont :: Proxy "Cont"
 pCont = Proxy
 
-instance MonadCont (Eff ((ContDef r (Eff xs)) ': xs)) where
+instance MonadCont (Eff (ContDef r (Eff xs) ': xs)) where
   callCC = callCCEff pCont
 
 -- | mtl-compatible reader

extensible-skeleton/src/Data/Extensible/Effect/TH.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE Trustworthy, TemplateHaskell, LambdaCase, ViewPatterns #-}
+{-# LANGUAGE Trustworthy, TemplateHaskellQuotes, LambdaCase, ViewPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE PatternSynonyms #-}
 ------------------------------------------------------------------------

extensible.cabal

@@ -16,7 +16,14 @@ copyright:           Copyright (c) 2017-2022 Fumiaki Kinoshita
 category:            Data, Records
 build-type:          Simple
 stability:           experimental
-Tested-With:         GHC == 8.10.7, GHC == 9.0.1, GHC == 9.2.1, GHC == 9.10.1
+Tested-With:         GHC == 8.10.7
+                      || == 9.0.2
+                      || == 9.2.8
+                      || == 9.4.8
+                      || == 9.6.7
+                      || == 9.8.4
+                      || == 9.10.1
+                      || == 9.12.2
 
 extra-source-files:
   examples/*.hs
@@ -86,7 +93,7 @@ library
     , constraints
     , deepseq
     , ghc-prim
-    , hashable >= 1.2 && <1.5
+    , hashable >= 1.2 && <1.6
     , incremental >= 0.3.1
     , membership
     , prettyprinter ^>= 1.7
@@ -96,7 +103,6 @@ library
     , StateVar
     , tagged
     , template-haskell
-    , text
     , th-lift >= 0.8
     , transformers
     , unordered-containers

src/Data/Extensible.hs

@@ -10,22 +10,23 @@
 --
 -- * Basic
 --
---     * 'Data.Extensible.Class': basic membership operations.
---     * 'Data.Extensible.Product': Combinators for extensible products
---     * 'Data.Extensible.Sum': the basic interface for extensible sums
---     * 'Data.Extensible.Field': extensible records and variants
---     * 'Data.Extensible.Inclusion': shrinking records and widening variants
+--     * [Class]("Data.Extensible.Class"): basic membership operations.
+--     * [Product]("Data.Extensible.Product"): Combinators for extensible products
+--     * [Sum]("Data.Extensible.Sum"): the basic interface for extensible sums
+--     * [Field]("Data.Extensible.Field"): extensible records and variants
+--     * [Inclusion]("Data.Extensible.Inclusion"): shrinking records and widening variants
 --
 -- * Advanced
---     * 'Data.Extensible.Record': Conversion between regular records and
---     extensible records
---     * 'Data.Extensible.Nullable': Nullable records
---     * 'Data.Extensible.Tangle': Extensible tangle
---     * 'Data.Extensible.Effect': Extensible effects
---     * 'Data.Extensible.Match': Extensible pattern match
+--
+--     * [Record]("Data.Extensible.Record"): Conversion between regular records and extensible records
+--     * [Nullable]("Data.Extensible.Nullable"): Nullable records
+--     * [Tangle]("Data.Extensible.Tangle"): Extensible tangle
+--     * [Effect]("Data.Extensible.Effect"): Extensible effects
+--     * [Match]("Data.Extensible.Match"): Extensible pattern match
 --
 -- * Internal
---     * 'Data.Extensible.Wrapper': Stock wrappers
+--
+--     * [Wrapper]("Data.Extensible.Wrapper"): Stock wrappers
 -----------------------------------------------------------------------------
 module Data.Extensible (
   module Data.Extensible.Class

src/Data/Extensible/Dictionary.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
 {-# LANGUAGE TypeFamilies, ScopedTypeVariables #-}
 {-# LANGUAGE UndecidableInstances, MultiParamTypeClasses #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
@@ -45,7 +45,7 @@ import qualified Data.HashMap.Strict as KM
 import Data.Functor.Compose
 import qualified Data.HashMap.Strict as HM
 import Data.Incremental
-import Data.Maybe (isJust)
+import Data.Maybe (isJust, fromMaybe)
 import Data.Monoid (Any(..))
 import Prettyprinter
 import qualified Data.Vector.Generic as G
@@ -123,7 +123,7 @@ instance WrapForall Bounded h xs => Bounded (xs :& h) where
 instance WrapForall TH.Lift h xs => TH.Lift (xs :& h) where
   lift = hfoldrWithIndexFor (Proxy :: Proxy (Instance1 TH.Lift h))
     (\_ x xs -> infixE (Just $ TH.lift x) (varE '(<:)) (Just xs)) (varE 'nil)
-#if MIN_VERSION_template_haskell(2,17,0) 
+#if MIN_VERSION_template_haskell(2,17,0)
   liftTyped e = TH.Code $ TH.TExp <$> TH.lift e
 #elif MIN_VERSION_template_haskell(2,16,0)
   liftTyped e = TH.TExp <$> TH.lift e
@@ -225,7 +225,7 @@ instance Forall (KeyTargetAre KnownSymbol (Instance1 J.FromJSON h)) xs => J.From
   parseJSON = J.withObject "Object" $ \v -> hgenerateFor
     (Proxy :: Proxy (KeyTargetAre KnownSymbol (Instance1 J.FromJSON h)))
     $ \m -> let k = stringKeyOf m
-      in fmap Field $ J.prependFailure ("parsing " ++ show k ++ ": ") $ J.parseJSON $ maybe J.Null id $ KM.lookup k v
+      in fmap Field $ J.prependFailure ("parsing " ++ show k ++ ": ") $ J.parseJSON $ fromMaybe J.Null $ KM.lookup k v
 
 instance Forall (KeyTargetAre KnownSymbol (Instance1 J.ToJSON h)) xs => J.ToJSON (xs :& Field h) where
   toJSON = J.Object . hfoldlWithIndexFor

src/Data/Extensible/Field.hs

@@ -3,7 +3,6 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE ScopedTypeVariables, TypeFamilies #-}
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 {-# LANGUAGE PolyKinds #-}
 -----------------------------------------------------------------------------