on master help sign in
Fixup after merge with master
aaf8d2cHarendra Kumar
benchmark/BaseStreams.hs+1−1
@@ -46,7 +46,7 @@ main =
46 [ bgroup "generation"
46 [ bgroup "generation"
47 [ benchIO "unfoldr" D.toNull D.sourceUnfoldr
47 [ benchIO "unfoldr" D.toNull D.sourceUnfoldr
48 , benchIO "unfoldrM" D.toNull D.sourceUnfoldrM
48 , benchIO "unfoldrM" D.toNull D.sourceUnfoldrM
49− , benchIO "fromEnum" D.toNull D.sourceFromEnum
49+ , benchIO "intFromTo" D.toNull D.sourceIntFromTo
50
50
51 , benchIO "fromList" D.toNull D.sourceFromList
51 , benchIO "fromList" D.toNull D.sourceFromList
52 -- , benchIO "fromFoldableM" D.sourceFromFoldableM
52 -- , benchIO "fromFoldableM" D.sourceFromFoldableM
benchmark/StreamDOps.hs+3−3
@@ -57,9 +57,9 @@ sourceUnfoldrM n = S.unfoldrM step n
57 then return Nothing
57 then return Nothing
58 else return (Just (cnt, cnt + 1))
58 else return (Just (cnt, cnt + 1))
59
59
60−{-# INLINE sourceFromEnum #-}
60+{-# INLINE sourceIntFromTo #-}
61−sourceFromEnum :: Monad m => Int -> Stream m Int
61+sourceIntFromTo :: Monad m => Int -> Stream m Int
62−sourceFromEnum n = S.intFromTo n (n + value)
62+sourceIntFromTo n = S.enumerateFromToIntegral n (n + value)
63
63
64{-# INLINE sourceFromList #-}
64{-# INLINE sourceFromList #-}
65sourceFromList :: Monad m => Int -> Stream m Int
65sourceFromList :: Monad m => Int -> Stream m Int
src/Streamly/Prelude.hs+1−1
@@ -358,7 +358,7 @@ import qualified Prelude
358import qualified System.IO as IO
358import qualified System.IO as IO
359
359
360import Streamly.Enumeration (Enumerable(..), enumerate, enumerateTo)
360import Streamly.Enumeration (Enumerable(..), enumerate, enumerateTo)
361−import Streamly.SVar (MonadAsync, defState, rstState)
361+import Streamly.SVar (MonadAsync, defState)
362import Streamly.Streams.Async (mkAsync')
362import Streamly.Streams.Async (mkAsync')
363import Streamly.Streams.Combinators (maxYields)
363import Streamly.Streams.Combinators (maxYields)
364import Streamly.Streams.Prelude (fromStreamS, toStreamS)
364import Streamly.Streams.Prelude (fromStreamS, toStreamS)
src/Streamly/Streams/Prelude.hs+1−1
@@ -83,7 +83,7 @@ toStreamS = S.fromStreamK . toStream
83{-# INLINE_EARLY runStream #-}
83{-# INLINE_EARLY runStream #-}
84runStream :: (IsStream t, Monad m) => t m a -> m ()
84runStream :: (IsStream t, Monad m) => t m a -> m ()
85runStream m = D.runStream $ D.fromStreamK (toStream m)
85runStream m = D.runStream $ D.fromStreamK (toStream m)
86−{-# RULES "run fallback to CPS" [1]
86+{-# RULES "runStream fallback to CPS" [1]
87 forall a. D.runStream (D.fromStreamK a) = K.runStream a #-}
87 forall a. D.runStream (D.fromStreamK a) = K.runStream a #-}
88
88
89------------------------------------------------------------------------------
89------------------------------------------------------------------------------