Merge pull request #29 from Shimuuar/deprecations

Deprecate sequenceA & implement all methods in Traversable
Shimuuar · Dec 14, 2024 · 2d769e5 · 2d769e5
2 parents 63aaec6 + a305a69
commit 2d769e5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/fixed-vector/ChangeLog.md b/fixed-vector/ChangeLog.md
@@ -23,6 +23,9 @@ Changes in 1.3.0.0
   * `Data.Vector.Fixed.Storable.unsafeWith` ensures that pointer won't
     get GC'd while function runs
 
+  * `Data.Vector.Fixed.sequenceA` is deprecated in favor of `sequence`
+
+
 Changes in 1.2.3.0
 
   * Pattern `V1` added

diff --git a/fixed-vector/Data/Vector/Fixed.hs b/fixed-vector/Data/Vector/Fixed.hs
@@ -117,7 +117,6 @@ module Data.Vector.Fixed (
   , scanl1
   , sequence
   , sequence_
-  , sequenceA
   , traverse
   , distribute
   , collect
@@ -184,6 +183,8 @@ module Data.Vector.Fixed (
   , defaultPoke
     -- ** NFData
   , defaultRnf
+    -- * Deprecated functions
+  , sequenceA
   ) where
 
 import Control.Applicative (Applicative(..))
@@ -284,7 +285,7 @@ deriving via ViaFixed (VecList n) instance (Arity n) => Applicative (VecList n)
 deriving via ViaFixed (VecList n) instance (Arity n) => F.Foldable  (VecList n)
 
 instance Arity n => T.Traversable (VecList n) where
-  sequenceA = sequenceA
+  sequenceA = sequence
   traverse  = traverse
 
 deriving via ViaFixed (VecList n) a instance (Arity n, Show      a) => Show      (VecList n a)
@@ -302,7 +303,7 @@ deriving via ViaFixed (VecPeano n) instance (ArityPeano n) => Applicative (VecPe
 deriving via ViaFixed (VecPeano n) instance (ArityPeano n) => F.Foldable  (VecPeano n)
 
 instance ArityPeano n => T.Traversable (VecPeano n) where
-  sequenceA = sequenceA
+  sequenceA = sequence
   traverse  = traverse
 
 deriving via ViaFixed (VecPeano n) a instance (ArityPeano n, Show      a) => Show      (VecPeano n a)

diff --git a/fixed-vector/Data/Vector/Fixed/Boxed.hs b/fixed-vector/Data/Vector/Fixed/Boxed.hs
@@ -66,7 +66,7 @@ deriving via ViaFixed (Vec n) instance Arity n => Applicative (Vec n)
 deriving via ViaFixed (Vec n) instance Arity n => F.Foldable  (Vec n)
 
 instance Arity n => T.Traversable (Vec n) where
-  sequenceA = sequenceA
+  sequenceA = sequence
   traverse  = traverse
   {-# INLINE sequenceA #-}
   {-# INLINE traverse #-}

diff --git a/fixed-vector/Data/Vector/Fixed/Cont.hs b/fixed-vector/Data/Vector/Fixed/Cont.hs
@@ -126,9 +126,10 @@ import qualified Data.Traversable as F
 import Unsafe.Coerce       (unsafeCoerce)
 import GHC.TypeLits
 import GHC.Exts       (Proxy#, proxy#)
-import Prelude hiding ( replicate,map,zipWith,zipWith3,maximum,minimum,and,or,any,all
-                      , foldl,foldr,foldl1,length,sum,reverse,scanl,scanl1
-                      , head,tail,mapM,mapM_,sequence,sequence_,concat
+import Prelude        ( Bool(..), Int, Maybe(..), Either(..)
+                      , Eq(..), Ord(..), Num(..), Functor(..), Applicative(..), Monad(..)
+                      , Semigroup(..), Monoid(..)
+                      , (.), ($), (&&), (||), (<$>), const, id, flip, error, otherwise, fst, maybe
                       )
 
 
@@ -508,18 +509,14 @@ instance (ArityPeano n) => F.Foldable (ContVec n) where
   {-# INLINE foldr #-}
 
 instance (ArityPeano n) => F.Traversable (ContVec n) where
-  sequenceA v = inspect v $ sequenceAF construct
+  sequence  = sequence
+  sequenceA = sequence
+  traverse  = mapM
+  mapM      = mapM
+  {-# INLINE sequence  #-}
   {-# INLINE sequenceA #-}
-
-sequenceAF :: forall f n a b. (Applicative f, ArityPeano n)
-     => Fun n a b -> Fun n (f a) (f b)
-{-# INLINE sequenceAF #-}
-sequenceAF (Fun f0)
-  = accum (\(T_sequenceA f) a -> T_sequenceA (f <*> a))
-          (\(T_sequenceA f)   -> f)
-          (T_sequenceA (pure f0) :: T_sequenceA f a b n)
-
-newtype T_sequenceA f a b n = T_sequenceA (f (Fn n a b))
+  {-# INLINE mapM      #-}
+  {-# INLINE traverse  #-}
 
 
 

diff --git a/fixed-vector/Data/Vector/Fixed/Internal.hs b/fixed-vector/Data/Vector/Fixed/Internal.hs
@@ -494,7 +494,8 @@ scanl1 f = vector . C.scanl1 f . C.cvec
 sequenceA :: (Vector v a, Vector v (f a), Applicative f)
           => v (f a) -> f (v a)
 {-# INLINE sequenceA #-}
-sequenceA = fmap vector . T.sequenceA . C.cvec
+sequenceA = sequence
+{-# DEPRECATED sequenceA "Use sequence instead" #-}
 
 -- | Analog of 'T.traverse' from 'T.Traversable'.
 traverse :: (Vector v a, Vector v b, Applicative f)

diff --git a/fixed-vector/Data/Vector/Fixed/Strict.hs b/fixed-vector/Data/Vector/Fixed/Strict.hs
@@ -56,7 +56,7 @@ deriving via ViaFixed (Vec n) instance Arity n => Applicative (Vec n)
 deriving via ViaFixed (Vec n) instance Arity n => F.Foldable  (Vec n)
 
 instance Arity n => T.Traversable (Vec n) where
-  sequenceA = sequenceA
+  sequenceA = sequence
   traverse  = traverse
   {-# INLINE sequenceA #-}
   {-# INLINE traverse #-}