Fix incomplete patterns in test code

Author: meooow25

containers-tests/benchmarks/IntMap.hs

@@ -191,6 +191,7 @@ maybeDel n | n `mod` 3 == 0 = Nothing
 ------------------------------------------------------------
 interleave :: [Int] -> [Int] -> [Int]
 interleave [] ys = ys
+interleave xs [] = xs
 interleave (x:xs) (y:ys) = x : y : interleave xs ys
 
 unitValues :: [Int] -> [(Int, ())]

containers-tests/benchmarks/IntSet.hs

@@ -139,6 +139,7 @@ fromListNoinline = IS.fromList
 
 interleave :: [a] -> [a] -> [a]
 interleave [] ys = ys
+interleave xs [] = xs
 interleave (x:xs) (y:ys) = x : y : interleave xs ys
 
 gen :: StdGen

containers-tests/benchmarks/Sequence.hs

@@ -226,8 +226,7 @@ fakeDeleteAt i xs
 -- and rejoin the pieces in the opposite order.
 -- Finally getting the middle element forces the whole spine.
 shuffle :: [Int] -> S.Seq Int -> Int
-shuffle ps s = case S.viewl (S.drop (S.length s `div` 2) (foldl' cut s ps)) of
-    x S.:< _ -> x
+shuffle ps s = S.index (foldl' cut s ps) (S.length s `div` 2)
   where cut xs p = let (front, back) = S.splitAt p xs in back S.>< front
 
 stateReplicate :: Int -> S.Seq Char

containers-tests/containers-tests.cabal

@@ -41,7 +41,10 @@ common deps
     , template-haskell
 
 common warnings
-  ghc-options: -Werror=unused-top-binds
+  ghc-options:
+    -Werror=unused-top-binds
+    -Werror=incomplete-patterns
+    -Werror=incomplete-uni-patterns
 
 common test-deps
   import: deps

containers-tests/tests/intmap-properties.hs

@@ -1386,6 +1386,7 @@ prop_mergeWithKeyModel xs ys
                                             (Nothing, Just y) -> if keep_y then Just (k, y) else Nothing
                                             (Just x, Nothing) -> if keep_x then Just (k, x) else Nothing
                                             (Just x, Just y) -> (\v -> (k, v)) `fmap` f k x y
+                                            (Nothing, Nothing) -> error "impossible"
 
           -- We prevent inlining testMergeWithKey to disable the SpecConstr
           -- optimalization. There are too many call patterns here so several
@@ -1951,14 +1952,18 @@ prop_maxViewWithKey m = case maxViewWithKey m of
 prop_minView :: IntMap A -> Property
 prop_minView m = case minView m of
   Nothing -> property $ null m
-  Just (x,m') | ~(_,x'):xs' <- toList m ->
-    valid m' .&&. x == x' .&&. toList m' === xs'
+  Just (x,m') -> valid m' .&&. kxs === (minKey, x) : toList m'
+    where
+      kxs = toList m
+      minKey = minimum (fmap fst kxs)
 
 prop_maxView :: IntMap A -> Property
 prop_maxView m = case maxView m of
   Nothing -> property $ null m
-  Just (x,m') | ~(_,x'):xs' <- toDescList m ->
-    valid m' .&&. x == x' .&&. toDescList m' === xs'
+  Just (x,m') -> valid m' .&&. kxs === (maxKey, x) : toDescList m'
+    where
+      kxs = toDescList m
+      maxKey = maximum (fmap fst kxs)
 
 prop_mapEither :: Fun A (Either B C) -> IntMap A -> Property
 prop_mapEither f m =

containers-tests/tests/map-properties.hs

@@ -1242,6 +1242,7 @@ prop_mergeWithKeyModel xs ys
                                             (Nothing, Just y) -> if keep_y then Just (k, y) else Nothing
                                             (Just x, Nothing) -> if keep_x then Just (k, x) else Nothing
                                             (Just x, Just y) -> (\v -> (k, v)) `fmap` f k x y
+                                            (Nothing, Nothing) -> error "impossible"
 
           -- We prevent inlining testMergeWithKey to disable the SpecConstr
           -- optimalization. There are too many call patterns here so several
@@ -1914,14 +1915,18 @@ prop_maxViewWithKey m = case maxViewWithKey m of
 prop_minView :: Map Int A -> Property
 prop_minView m = case minView m of
   Nothing -> property $ null m
-  Just (x,m') | ~(_,x'):xs' <- toList m ->
-    valid m' .&&. x == x' .&&. toList m' === xs'
+  Just (x,m') -> valid m' .&&. kxs === (minKey, x) : toList m'
+    where
+      kxs = toList m
+      minKey = minimum (fmap fst kxs)
 
 prop_maxView :: Map Int A -> Property
 prop_maxView m = case maxView m of
   Nothing -> property $ null m
-  Just (x,m') | ~(_,x'):xs' <- toDescList m ->
-    valid m' .&&. x == x' .&&. toDescList m' === xs'
+  Just (x,m') -> valid m' .&&. kxs === (maxKey, x) : toDescList m'
+    where
+      kxs = toDescList m
+      maxKey = maximum (fmap fst kxs)
 
 prop_isSubmapOf :: Map Int A -> Map Int A -> Property
 prop_isSubmapOf m1 m2 = isSubmapOf m1 m2 === all (`elem` kys) (toList m1)