git.iko.soy/streamly
on master help sign in
Use fusion-plugin-types, not fusion-plugin for annotations.
commit3d884d4c1cbf2013bc45ca9459c09b42ef251cc2 authorPranay Sashank <pranaysashank@gmail.com> dateFri 14 Feb 2020, 19:15 (7 years ago) parentd38ab54
4 files changed+8−34
compare with master
unifiedsplit
src/Streamly/Internal/Data/Stream/StreamD/Type.hs+1−1 src/Streamly/Internal/Fusion.hs−24 stack.yaml+2−1 streamly.cabal+5−8
src/Streamly/Internal/Data/Stream/StreamD/Type.hs+1−1
@@ -74,7 +74,7 @@ import Data.Functor.Identity (Identity(..))
7474import GHC.Base (build)
7575import GHC.Types (SPEC(..))
7676import Prelude hiding (map, mapM, foldr, take, concatMap)
77−import Streamly.Internal.Fusion (Fuse(..))
77+import Fusion.Plugin.Types (Fuse(..))
7878
7979import Streamly.Internal.Data.SVar (State(..), adaptState, defState)
8080import Streamly.Internal.Data.Fold.Types (Fold(..), Fold2(..))
src/Streamly/Internal/Fusion.hsdeleted−24
@@ -1,24 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
3−
4−-- |
5−-- Module : Streamly.Internal.Fusion
6−-- Copyright : (c) Composewell Technologies
7−--
8−-- License : BSD3
9−-- Maintainer : streamly@composewell.com
10−-- Stability : experimental
11−-- Portability : GHC
12−
13−module Streamly.Internal.Fusion
14− (
15− Fuse (..)
16− )
17−where
18−
19−#if defined(__GHCJS__) || __GLASGOW_HASKELL__ < 806
20−import Data.Data (Data)
21−data Fuse = Fuse deriving (Data)
22−#else
23−import Fusion.Plugin.Types (Fuse(..))
24−#endif
stack.yaml+2−1
@@ -7,7 +7,8 @@ extra-deps:
77 - Chart-diagrams-1.9.2
88 - bench-show-0.2.2
99 - inspection-testing-0.4.2.1
10− - fusion-plugin-0.1.1
10+ - fusion-plugin-types-0.1.0
11+ - fusion-plugin-0.2.0
1112
1213#allow-newer: true
1314flags: {}
streamly.cabal+5−8
@@ -249,7 +249,7 @@ common test-options
249249 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
250250 ghc-options: -fplugin Fusion.Plugin
251251 build-depends:
252− fusion-plugin >= 0.1 && < 0.2
252+ fusion-plugin >= 0.2 && < 0.3
253253
254254-- Used by maxrate test, benchmarks and executables
255255common exe-options
@@ -257,7 +257,7 @@ common exe-options
257257 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
258258 ghc-options: -fplugin Fusion.Plugin
259259 build-depends:
260− fusion-plugin >= 0.1 && < 0.2
260+ fusion-plugin >= 0.2 && < 0.3
261261
262262-- Some benchmarks are threaded some are not
263263-- XXX dependencies should be separated under bench-depends
@@ -267,7 +267,7 @@ common bench-options
267267 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
268268 ghc-options: -fplugin Fusion.Plugin
269269 build-depends:
270− fusion-plugin >= 0.1 && < 0.2
270+ fusion-plugin >= 0.2 && < 0.3
271271 build-depends: mtl >= 2.2 && < 3
272272
273273common bench-options-threaded
@@ -278,7 +278,7 @@ common bench-options-threaded
278278 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
279279 ghc-options: -fplugin Fusion.Plugin
280280 build-depends:
281− fusion-plugin >= 0.1 && < 0.2
281+ fusion-plugin >= 0.2 && < 0.3
282282 build-depends: mtl >= 2.2 && < 3
283283
284284-------------------------------------------------------------------------------
@@ -373,7 +373,6 @@ library
373373 , Streamly.Internal.Data.Unicode.Char
374374 , Streamly.Internal.Memory.Unicode.Array
375375 , Streamly.Internal.Prelude
376− , Streamly.Internal.Fusion
377376
378377 -- Mutable data
379378 , Streamly.Internal.Mutable.Prim.Var
@@ -410,9 +409,7 @@ library
410409 , monad-control >= 1.0 && < 2
411410 , transformers-base >= 0.4 && < 0.5
412411
413− if !impl(ghcjs) && !impl(ghc < 8.6)
414− build-depends:
415− fusion-plugin >= 0.1 && < 0.2
412+ , fusion-plugin-types >= 0.1 && < 0.2
416413
417414 if !impl(ghcjs)
418415 build-depends: