Merge branch 'main' into gsubst-exposed

Author: lambdageek

.github/workflows/ci.yml

@@ -34,6 +34,7 @@ jobs:
           - "9.0"
           - "9.2"
           - "9.4"
+          - "9.8"
         # exclude:
         #   - os: macOS-latest
         #     ghc: 8.8

Changelog.md

@@ -1,6 +1,11 @@
 # NEXT
 
+* Add `Alpha` and `Subst` instances for `NonEmpty`.  Thanks Brent Yorgey (byorgey)
+* Add GHC 9.8 to CI matrix
+* Bump base >= 4.9
+* Remove `tested-with: 7.x` in `unbound-generics.cabal`. We removed CI testing with GHC 7.x last year.
 * Move GSubst from `Unbound.Generics.LocallyNameless.Subst` into a separate `Internal` module that is exported. Now users can write their own generic traversals.
+  Thanks Bohdan Liesnikov (liesnikov)
 
 # 0.4.3
 

src/Unbound/Generics/LocallyNameless/Alpha.hs

@@ -60,6 +60,7 @@ import Data.Function (on)
 import Data.Functor.Contravariant (Contravariant(..))
 import Data.Foldable (Foldable(..))
 import Data.List (intersect)
+import Data.List.NonEmpty (NonEmpty)
 import Data.Monoid (Monoid(..), All(..))
 import Data.Ratio (Ratio)
 import Data.Semigroup as Sem
@@ -687,6 +688,7 @@ instance Alpha Bool
 
 instance Alpha a => Alpha (Maybe a)
 instance Alpha a => Alpha [a]
+instance Alpha a => Alpha (NonEmpty a)
 instance Alpha ()
 instance (Alpha a,Alpha b) => Alpha (Either a b)
 instance (Alpha a,Alpha b) => Alpha (a,b)

src/Unbound/Generics/LocallyNameless/Subst.hs

@@ -53,6 +53,7 @@ module Unbound.Generics.LocallyNameless.Subst (
 import GHC.Generics
 
 import Data.List (find)
+import Data.List.NonEmpty (NonEmpty)
 
 import Unbound.Generics.LocallyNameless.Name
 import Unbound.Generics.LocallyNameless.Alpha
@@ -159,6 +160,7 @@ instance (Subst c a, Subst c b, Subst c d, Subst c e) => Subst c (a,b,d,e)
 instance (Subst c a, Subst c b, Subst c d, Subst c e, Subst c f) =>
    Subst c (a,b,d,e,f)
 instance (Subst c a) => Subst c [a]
+instance (Subst c a) => Subst c (NonEmpty a)
 instance (Subst c a) => Subst c (Maybe a)
 instance (Subst c a, Subst c b) => Subst c (Either a b)
 

unbound-generics.cabal

@@ -28,7 +28,7 @@ extra-source-files:  examples/*.hs, examples/*.lhs,
                      README.md,
                      Changelog.md
 
-tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.*, GHC == 9.4.*
+tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.*, GHC == 9.4.*, GHC == 9.8.*
 
 library
   exposed-modules:     Unbound.Generics.LocallyNameless
@@ -53,7 +53,7 @@ library
                        Unbound.Generics.LocallyNameless.Subst
   -- other-modules:
   -- other-extensions:
-  build-depends:       base >=4.6 && <5,
+  build-depends:       base >=4.9 && <5,
                        template-haskell >= 2.8.0.0,
                        deepseq >= 1.3.0.0,
                        mtl >= 2.1,