Merge pull request #123 from dolio/master

Use mapM in createT because ST wasn't Applicative in 7.0

Author: dolio

Data/Vector/Generic.hs

@@ -217,9 +217,7 @@ mkNoRepType :: String -> DataType
 mkNoRepType = mkNorepType
 #endif
 
-#if !MIN_VERSION_base(4,8,0)
-import Data.Traversable (Traversable, traverse)
-#endif
+import qualified Data.Traversable as T (Traversable(mapM))
 
 -- Length information
 -- ------------------
@@ -723,9 +721,11 @@ create :: Vector v a => (forall s. ST s (Mutable v s a)) -> v a
 create p = new (New.create p)
 
 -- | Execute the monadic action and freeze the resulting vectors.
-createT :: (Traversable f, Vector v a) => (forall s. ST s (f (Mutable v s a))) -> f (v a)
+createT
+  :: (T.Traversable f, Vector v a)
+  => (forall s. ST s (f (Mutable v s a))) -> f (v a)
 {-# INLINE createT #-}
-createT p = runST (p >>= traverse unsafeFreeze)
+createT p = runST (p >>= T.mapM unsafeFreeze)
 
 -- Restricting memory usage
 -- ------------------------

tests/Tests/Vector.hs

@@ -3,7 +3,7 @@ module Tests.Vector (tests) where
 import Boilerplater
 import Utilities as Util
 
-import Data.Traversable (Traversable(..))
+import qualified Data.Traversable as T (Traversable(..))
 import Data.Foldable (Foldable(foldMap))
 
 import qualified Data.Vector.Generic as V
@@ -73,7 +73,7 @@ import Control.Monad.Trans.Writer
 instance Foldable ((,) a) where
   foldMap f (_, b) = f b
 
-instance Traversable ((,) a) where
+instance T.Traversable ((,) a) where
   traverse f (a, b) = fmap ((,) a) $ f b
 #endif
 
@@ -233,7 +233,7 @@ testPolymorphicFunctions _ = $(testProperties [
               = (\n _ _ -> n < 1000) ===> V.iterateN `eq` (\n f -> take n . iterate f)
 
     prop_createT :: P ((a, v a) -> (a, v a))
-    prop_createT = (\v -> V.createT (traverse V.thaw v)) `eq` id
+    prop_createT = (\v -> V.createT (T.mapM V.thaw v)) `eq` id
 
     prop_head      :: P (v a -> a) = not . V.null ===> V.head `eq` head
     prop_last      :: P (v a -> a) = not . V.null ===> V.last `eq` last