Use liftA2 qualified to pacify GHC < 9.6

byteverse · Feb 6, 2024 · f50a63a · f50a63a
1 parent 0caa736
commit f50a63a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Revision history for contiguous
 
+## 0.6.4.2 -- 2024-02-06
+
+* Restore support for versions of base that do not export `liftA2`
+  from the prelude.
+
 ## 0.6.4.1 -- 2024-02-05
 
 * Update package metadata.

diff --git a/contiguous.cabal b/contiguous.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               contiguous
-version:            0.6.4.1
+version:            0.6.4.2
 homepage:           https://github.com/byteverse/contiguous
 bug-reports:        https://github.com/byteverse/contiguous/issues
 author:             Andrew Martin

diff --git a/src/Data/Primitive/Contiguous.hs b/src/Data/Primitive/Contiguous.hs
@@ -1082,7 +1082,7 @@ itraverse f = \arr ->
           then pure (STA unsafeFreeze)
           else case index# arr ix of
             (# x #) ->
-              liftA2
+              A.liftA2
                 ( \b (STA m) -> STA $ \marr -> do
                     write marr ix b
                     m marr
@@ -1330,7 +1330,7 @@ generateM !sz f =
   let go !ix =
         if ix < sz
           then
-            liftA2
+            A.liftA2
               ( \b (STA m) -> STA $ \marr -> do
                   write marr ix b
                   m marr