@@ -575,20 +575,21 @@ tl_index s = forAll (choose (-l,l*2)) ((s L.!!) `eq` (TL.index (packS s)
575575 where l = L.length s
576576
577577t_findIndex p = L.findIndex p `eqP` T.findIndex p
578−t_count t = (subtract 1 . L.length . T.split t) `eq` T.count t
579−tl_count t = (subtract 1 . L.genericLength . TL.split t) `eq` TL.count t
578+t_count (NotEmpty t) = (subtract 1 . L.length . T.split t) `eq` T.count t
579+tl_count (NotEmpty t) = (subtract 1 . L.genericLength . TL.split t) `eq` TL.count t
580580t_zip s = L.zip s `eqP` T.zip (packS s)
581581tl_zip s = L.zip s `eqP` TL.zip (packS s)
582582sf_zipWith p c s = (L.zipWith c (L.filter p s) . L.filter p) `eqP` (unpackS . S.zipWith c (S.filter p $ packS s) . S.filter p)
583583t_zipWith c s = L.zipWith c s `eqP` (unpackS . T.zipWith c (packS s))
584584tl_zipWith c s = L.zipWith c s `eqP` (unpackS . TL.zipWith c (packS s))
585585
586−t_indices = unsquare (\s -> Slow.indices s `eq` indices s)
587−tl_indices = unsquare (\s -> lazyIndices s `eq` S.indices s)
586+t_indices = unsquare (\(NotEmpty s) -> Slow.indices s `eq` indices s)
587+tl_indices = unsquare (\(NotEmpty s) -> lazyIndices s `eq` S.indices s)
588588 where lazyIndices s t = map fromIntegral $ Slow.indices (conc s) (conc t)
589589 conc = T.concat . TL.toChunks
590−t_indices_occurs t = unsquare (\ts -> let s = T.intercalate t ts
591− in Slow.indices t s == indices t s)
590+t_indices_occurs (NotEmpty t) = unsquare $ \ts ->
591+ let s = T.intercalate t ts
592+ in Slow.indices t s == indices t s
592593
593594-- Bit shifts.
594595shiftL w = forAll (choose (0,width-1)) $ \k -> Bits.shiftL w k == U.shiftL w k