Extract streaming functionality into vector-stream package. Fix haskell#355

lehins · lehins · commit e8a9b21585f9 · 2021-08-15T23:41:56.000+03:00
diff --git a/cabal.project b/cabal.project
@@ -1 +1,3 @@
-packages: vector/vector.cabal
+packages:
+  vector
+  vector-stream
diff --git a/vector-stream/README.md b/vector-stream/README.md
@@ -1,6 +1,6 @@
 The `vector` package [![Build Status](https://travis-ci.org/haskell/vector.png?branch=master)](https://travis-ci.org/haskell/vector)
 ====================
 
-An efficient implementation monadic streams used for fusion in `vector` package
+An efficient implementation of monadic streams used for fusion in `vector` package
 
 See [`vector-stream` on Hackage](http://hackage.haskell.org/package/vector-stream) for more information.
diff --git a/vector-stream/changelog.md b/vector-stream/changelog.md
@@ -1,4 +1,4 @@
 # Changes in version 0.1.0.0
 
- * Initial move from `vector`, which will depend on this package starting with
+ * Initial move from `vector`, which will depend on this package starting from
    `vector-0.13.0.0`
diff --git a/vector/src/Data/Vector/Fusion/Stream/Monadic.hs b/vector/src/Data/Vector/Fusion/Stream/Monadic.hs
@@ -0,0 +1,17 @@
+-- |
+-- Module      : Data.Vector.Fusion.Stream.Monadic
+-- Copyright   : (c) Roman Leshchinskiy 2008-2010
+-- License     : BSD-style
+--
+-- Maintainer  : Roman Leshchinskiy <rl@cse.unsw.edu.au>
+-- Stability   : experimental
+-- Portability : non-portable
+--
+-- Monadic stream combinators.
+--
+
+module Data.Vector.Fusion.Stream.Monadic
+  ( module Data.Stream.Monadic
+  ) where
+
+import Data.Stream.Monadic
diff --git a/vector/src/Data/Vector/Fusion/Util.hs b/vector/src/Data/Vector/Fusion/Util.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 -- |
 -- Module      : Data.Vector.Fusion.Util
 -- Copyright   : (c) Roman Leshchinskiy 2009
@@ -17,6 +16,8 @@ module Data.Vector.Fusion.Util (
   delay_inline, delayed_min
 ) where
 
+import Data.Stream.Monadic (Box(..), liftBox)
+
 -- | Identity monad
 newtype Id a = Id { unId :: a }
 
@@ -31,24 +32,6 @@ instance Monad Id where
   return = pure
   Id x >>= f = f x
 
--- | Box monad
-data Box a = Box { unBox :: a }
-
-instance Functor Box where
-  fmap f (Box x) = Box (f x)
-
-instance Applicative Box where
-  pure = Box
-  Box f <*> Box x = Box (f x)
-
-instance Monad Box where
-  return = pure
-  Box x >>= f = f x
-
-liftBox :: Monad m => Box a -> m a
-liftBox (Box a) = return a
-{-# INLINE liftBox #-}
-
 -- | Delay inlining a function until late in the game (simplifier phase 0).
 delay_inline :: (a -> b) -> a -> b
 {-# INLINE [0] delay_inline #-}
diff --git a/vector/vector.cabal b/vector/vector.cabal
@@ -138,6 +138,7 @@ Library
                , primitive >= 0.6.4.0 && < 0.8
                , ghc-prim >= 0.2 && < 0.8
                , deepseq >= 1.1 && < 1.5
+               , vector-stream >= 0.1 && < 0.2
 
   Ghc-Options: -O2 -Wall
 
