Merge pull request #122 from Bodigrim/master

Future-proof against potential Prelude.foldl'
expipiplus1 · Jun 9, 2023 · 5175e1e · 5175e1e
2 parents f7dc4dc + bc7136a
commit 5175e1e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/src/Data/Vector/Generic/Sized.hs b/src/Data/Vector/Generic/Sized.hs
@@ -281,10 +281,10 @@ import Unsafe.Coerce
 import qualified Data.Functor.Rep as Rep
 import Data.Distributive
 import Prelude
-       hiding (length, replicate, (++), head, last, init, tail, take,
+       hiding (Foldable(..), replicate, (++), head, last, init, tail, take,
                drop, splitAt, reverse, map, concatMap, zipWith, zipWith3, zip,
-               zip3, unzip, unzip3, elem, notElem, foldl, foldl1, foldr, foldr1,
-               all, any, and, or, sum, product, maximum, minimum, scanl, scanl1,
+               zip3, unzip, unzip3, notElem,
+               all, any, and, or, scanl, scanl1,
                scanr, scanr1, mapM, mapM_, sequence, sequence_)
 import Data.IndexedListLiterals hiding (toList, fromList)
 import Data.Hashable (Hashable(..))

diff --git a/src/Data/Vector/Primitive/Sized.hs b/src/Data/Vector/Primitive/Sized.hs
@@ -221,16 +221,15 @@ import Data.Finite
 import Data.Primitive (Prim)
 import Data.Proxy
 import Control.Monad.Primitive
-import Prelude hiding ( length, null,
+import Prelude hiding ( Foldable(..),
                         replicate, (++), concat,
                         head, last,
                         init, tail, take, drop, splitAt, reverse,
                         map, concat, concatMap,
                         zipWith, zipWith3, zip, zip3, unzip, unzip3,
                         filter, takeWhile, dropWhile, span, break,
-                        elem, notElem,
-                        foldl, foldl1, foldr, foldr1,
-                        all, any, and, or, sum, product, maximum, minimum,
+                        notElem,
+                        all, any, and, or,
                         scanl, scanl1, scanr, scanr1,
                         enumFromTo, enumFromThenTo,
                         mapM, mapM_, sequence, sequence_,

diff --git a/src/Data/Vector/Sized.hs b/src/Data/Vector/Sized.hs
@@ -249,16 +249,15 @@ import Data.Finite
 import Data.Proxy
 import Data.IndexedListLiterals hiding (toList, fromList)
 import Control.Monad.Primitive
-import Prelude hiding ( length, null,
+import Prelude hiding ( Foldable(..),
                         replicate, (++), concat,
                         head, last,
                         init, tail, take, drop, splitAt, reverse,
                         map, concat, concatMap,
                         zipWith, zipWith3, zip, zip3, unzip, unzip3,
                         filter, takeWhile, dropWhile, span, break,
-                        elem, notElem,
-                        foldl, foldl1, foldr, foldr1,
-                        all, any, and, or, sum, product, maximum, minimum,
+                        notElem,
+                        all, any, and, or,
                         scanl, scanl1, scanr, scanr1,
                         enumFromTo, enumFromThenTo,
                         mapM, mapM_, sequence, sequence_,

diff --git a/src/Data/Vector/Storable/Sized.hs b/src/Data/Vector/Storable/Sized.hs
@@ -249,16 +249,15 @@ import Data.Finite
 import Data.Proxy
 import Control.Monad.Primitive
 import Foreign.Storable
-import Prelude hiding ( length, null,
+import Prelude hiding ( Foldable(..),
                         replicate, (++), concat,
                         head, last,
                         init, tail, take, drop, splitAt, reverse,
                         map, concat, concatMap,
                         zipWith, zipWith3, zip, zip3, unzip, unzip3,
                         filter, takeWhile, dropWhile, span, break,
-                        elem, notElem,
-                        foldl, foldl1, foldr, foldr1,
-                        all, any, and, or, sum, product, maximum, minimum,
+                        notElem,
+                        all, any, and, or,
                         scanl, scanl1, scanr, scanr1,
                         enumFromTo, enumFromThenTo,
                         mapM, mapM_, sequence, sequence_,

diff --git a/src/Data/Vector/Unboxed/Sized.hs b/src/Data/Vector/Unboxed/Sized.hs
@@ -251,16 +251,15 @@ import Data.Finite
 import Data.Proxy
 import Control.Monad.Primitive
 import Data.Vector.Unboxed (Unbox)
-import Prelude hiding ( length, null,
+import Prelude hiding ( Foldable(..),
                         replicate, (++), concat,
                         head, last,
                         init, tail, take, drop, splitAt, reverse,
                         map, concat, concatMap,
                         zipWith, zipWith3, zip, zip3, unzip, unzip3,
                         filter, takeWhile, dropWhile, span, break,
-                        elem, notElem,
-                        foldl, foldl1, foldr, foldr1,
-                        all, any, and, or, sum, product, maximum, minimum,
+                        notElem,
+                        all, any, and, or,
                         scanl, scanl1, scanr, scanr1,
                         enumFromTo, enumFromThenTo,
                         mapM, mapM_, sequence, sequence_,