Merge branch 'master' into new_travis

Fixes test failures.

Author: dolio

Data/Vector/Generic.hs

@@ -1757,15 +1757,15 @@ iscanl :: (Vector v a, Vector v b) => (Int -> a -> b -> a) -> a -> v b -> v a
 {-# INLINE iscanl #-}
 iscanl f z =
     unstream
-  . inplace (S.scanl (\a (i, b) -> f i a b) z . S.indexed) id
+  . inplace (S.scanl (\a (i, b) -> f i a b) z . S.indexed) (+1)
   . stream
 
 -- | /O(n)/ Scan over a vector (strictly) with its index
 iscanl' :: (Vector v a, Vector v b) => (Int -> a -> b -> a) -> a -> v b -> v a
 {-# INLINE iscanl' #-}
 iscanl' f z =
     unstream
-  . inplace (S.scanl' (\a (i, b) -> f i a b) z . S.indexed) id
+  . inplace (S.scanl' (\a (i, b) -> f i a b) z . S.indexed) (+1)
   . stream
 
 
@@ -1822,18 +1822,22 @@ scanr' f z = unstreamR . Bundle.scanl' (flip f) z . streamR
 -- | /O(n)/ Right-to-left scan over a vector with its index
 iscanr :: (Vector v a, Vector v b) => (Int -> a -> b -> b) -> b -> v a -> v b
 {-# INLINE iscanr #-}
-iscanr f z =
+iscanr f z v =
     unstreamR
-  . inplace (S.scanl (flip $ uncurry f) z . S.indexed) id
+  . inplace (S.scanl (flip $ uncurry f) z . S.indexedR n) (+1)
   . streamR
+  $ v
+ where n = length v
 
 -- | /O(n)/ Right-to-left scan over a vector (strictly) with its index
 iscanr' :: (Vector v a, Vector v b) => (Int -> a -> b -> b) -> b -> v a -> v b
 {-# INLINE iscanr' #-}
-iscanr' f z =
+iscanr' f z v =
     unstreamR
-  . inplace (S.scanl' (flip $ uncurry f) z . S.indexed) id
+  . inplace (S.scanl' (flip $ uncurry f) z . S.indexedR n) (+1)
   . streamR
+  $ v
+ where n = length v
 
 -- | /O(n)/ Right-to-left scan over a non-empty vector
 scanr1 :: Vector v a => (a -> a -> a) -> v a -> v a

tests/Utilities.hs

@@ -52,12 +52,6 @@ instance Arbitrary a => Arbitrary (S.Bundle v a) where
 instance CoArbitrary a => CoArbitrary (S.Bundle v a) where
     coarbitrary = coarbitrary . S.toList
 
-instance Arbitrary a => Arbitrary (Identity a) where
-    arbitrary = fmap Identity arbitrary
-
-instance CoArbitrary a => CoArbitrary (Identity a) where
-    coarbitrary = coarbitrary . runIdentity
-
 instance Arbitrary a => Arbitrary (Writer a ()) where
     arbitrary = fmap (writer . ((,) ())) arbitrary
 
@@ -219,7 +213,7 @@ notNullS2 _ s = not $ S.null s
 
 -- Generators
 index_value_pairs :: Arbitrary a => Int -> Gen [(Int,a)]
-index_value_pairs 0 = return [] 
+index_value_pairs 0 = return []
 index_value_pairs m = sized $ \n ->
   do
     len <- choose (0,n)
@@ -254,7 +248,7 @@ accum f xs ps = go xs ps' 0
     go (x:xs) ((i,y) : ps) j
       | i == j     = go (f x y : xs) ps j
     go (x:xs) ps j = x : go xs ps (j+1)
-    go [] _ _      = []  
+    go [] _ _      = []
 
 (//) :: [a] -> [(Int, a)] -> [a]
 xs // ps = go xs ps' 0

tests/vector-tests.cabal

@@ -156,6 +156,9 @@ Library
 
   Ghc-Options: -O2 -Wall -fno-warn-orphans
 
+  if impl(ghc >= 8.0) && impl( ghc < 8.1)
+    Ghc-Options:   -Wno-redundant-constraints
+
   if flag(BoundsChecks)
     cpp-options: -DVECTOR_BOUNDS_CHECKS
 
@@ -178,7 +181,7 @@ test-suite vector-tests-O0
   hs-source-dirs: tests
   Build-Depends: base >= 4 && < 5, template-haskell, vector,
                  random,
-                 QuickCheck >=  2.7  && < 2.8 , test-framework, test-framework-quickcheck2,
+                 QuickCheck >= 2.9 && < 2.10 , test-framework, test-framework-quickcheck2,
                  transformers >= 0.2.0.0
 
   default-extensions: CPP,
@@ -193,6 +196,9 @@ test-suite vector-tests-O0
 
   Ghc-Options: -O0
   Ghc-Options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
+  if impl(ghc >= 8.0) && impl( ghc < 8.1)
+    Ghc-Options:   -Wno-redundant-constraints
+
 
 test-suite vector-tests-O2
   Default-Language: Haskell2010
@@ -201,7 +207,7 @@ test-suite vector-tests-O2
   hs-source-dirs: tests
   Build-Depends: base >= 4 && < 5, template-haskell, vector,
                  random,
-                 QuickCheck  >= 2.7, test-framework, test-framework-quickcheck2,
+                 QuickCheck >= 2.9 && < 2.10 , test-framework, test-framework-quickcheck2,
                  transformers >= 0.2.0.0
 
   default-extensions: CPP,
@@ -215,4 +221,7 @@ test-suite vector-tests-O2
               TemplateHaskell
 
   Ghc-Options: -O2
+  if impl(ghc >= 8.0) && impl( ghc < 8.1)
+    Ghc-Options:   -Wno-redundant-constraints
+
   Ghc-Options: -Wall -fno-warn-orphans -fno-warn-missing-signatures