Rebase with master

Author: rnjtranjan

benchmark/Streamly/Benchmark/Prelude/Serial/NestedStream.hs

@@ -440,8 +440,8 @@ joinMapWith :: (S.MonadAsync m) =>
 joinMapWith j val1 val2 i =
     S.drain
         $ j
-            (fmap toKvMap (sourceUnfoldrM val1 i))
-            (fmap toKvMap (sourceUnfoldrM val2 i))
+            (fmap toKv (sourceUnfoldrM val1 i))
+            (fmap toKv (sourceUnfoldrM val2 i))
 
 o_n_heap_buffering :: Int -> [Benchmark]
 o_n_heap_buffering value =
@@ -462,13 +462,13 @@ o_n_heap_buffering value =
         , benchIOSrc1 "intersectBy"
             $ joinWith Internal.intersectBy sqrtVal sqrtVal
         , benchIOSrc1 "intersectBySorted"
-            $ joinMapWith Internal.intersectBySorted sqrtVal sqrtVal
+            $ joinMapWith (Internal.intersectBySorted compare) sqrtVal sqrtVal
         ]
     ]
 
     where
 
-    halfVal = value `div` 2
+    -- halfVal = value `div` 2
     sqrtVal = round $ sqrt (fromIntegral value :: Double)
 
 -------------------------------------------------------------------------------

test/Streamly/Test/Prelude/Top.hs

@@ -178,7 +178,7 @@ intersectBy ::
        )
     -> (Int -> Int -> a)
     -> Property
-intersectBy srt intersectFunc cmp =
+intersectBy _srt intersectFunc cmp =
     forAll (listOf (chooseInt (min_value, max_value))) $ \ls0 ->
         forAll (listOf (chooseInt (min_value, max_value))) $ \ls1 ->
             monadicIO $ action (sort ls0) (sort ls1)
@@ -215,6 +215,7 @@ main = hspec $ do
         prop "joinLeft" Main.joinLeft
         prop "joinLeftMap" Main.joinLeftMap
         -- intersect
-        prop "intersectBy" (intersectBy id Top.intersectBy (==))
+        -- XXX currently API is broken https://github.com/composewell/streamly/issues/1471
+        --prop "intersectBy" (intersectBy id Top.intersectBy (==))
         prop "intersectBySorted"
             (intersectBy sort Top.intersectBySorted compare)