git.iko.soy/streamly
on master help sign in
Use fusion-plugin-types, not fusion-plugin for annotations.
3d884d4Pranay Sashank
src/Streamly/Internal/Data/Stream/StreamD/Type.hs+1−1
compare with master
unifiedsplit
@@ -74,7 +74,7 @@ import Data.Functor.Identity (Identity(..))
74import GHC.Base (build)
74import GHC.Base (build)
75import GHC.Types (SPEC(..))
75import GHC.Types (SPEC(..))
76import Prelude hiding (map, mapM, foldr, take, concatMap)
76import Prelude hiding (map, mapM, foldr, take, concatMap)
77−import Streamly.Internal.Fusion (Fuse(..))
77+import Fusion.Plugin.Types (Fuse(..))
78
78
79import Streamly.Internal.Data.SVar (State(..), adaptState, defState)
79import Streamly.Internal.Data.SVar (State(..), adaptState, defState)
80import Streamly.Internal.Data.Fold.Types (Fold(..), Fold2(..))
80import 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:
7 - Chart-diagrams-1.9.2
7 - Chart-diagrams-1.9.2
8 - bench-show-0.2.2
8 - bench-show-0.2.2
9 - inspection-testing-0.4.2.1
9 - 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
11
12
12#allow-newer: true
13#allow-newer: true
13flags: {}
14flags: {}
streamly.cabal+5−8
@@ -249,7 +249,7 @@ common test-options
249 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
249 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
250 ghc-options: -fplugin Fusion.Plugin
250 ghc-options: -fplugin Fusion.Plugin
251 build-depends:
251 build-depends:
252− fusion-plugin >= 0.1 && < 0.2
252+ fusion-plugin >= 0.2 && < 0.3
253
253
254-- Used by maxrate test, benchmarks and executables
254-- Used by maxrate test, benchmarks and executables
255common exe-options
255common exe-options
@@ -257,7 +257,7 @@ common exe-options
257 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
257 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
258 ghc-options: -fplugin Fusion.Plugin
258 ghc-options: -fplugin Fusion.Plugin
259 build-depends:
259 build-depends:
260− fusion-plugin >= 0.1 && < 0.2
260+ fusion-plugin >= 0.2 && < 0.3
261
261
262-- Some benchmarks are threaded some are not
262-- Some benchmarks are threaded some are not
263-- XXX dependencies should be separated under bench-depends
263-- XXX dependencies should be separated under bench-depends
@@ -267,7 +267,7 @@ common bench-options
267 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
267 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
268 ghc-options: -fplugin Fusion.Plugin
268 ghc-options: -fplugin Fusion.Plugin
269 build-depends:
269 build-depends:
270− fusion-plugin >= 0.1 && < 0.2
270+ fusion-plugin >= 0.2 && < 0.3
271 build-depends: mtl >= 2.2 && < 3
271 build-depends: mtl >= 2.2 && < 3
272
272
273common bench-options-threaded
273common bench-options-threaded
@@ -278,7 +278,7 @@ common bench-options-threaded
278 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
278 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
279 ghc-options: -fplugin Fusion.Plugin
279 ghc-options: -fplugin Fusion.Plugin
280 build-depends:
280 build-depends:
281− fusion-plugin >= 0.1 && < 0.2
281+ fusion-plugin >= 0.2 && < 0.3
282 build-depends: mtl >= 2.2 && < 3
282 build-depends: mtl >= 2.2 && < 3
283
283
284-------------------------------------------------------------------------------
284-------------------------------------------------------------------------------
@@ -373,7 +373,6 @@ library
373 , Streamly.Internal.Data.Unicode.Char
373 , Streamly.Internal.Data.Unicode.Char
374 , Streamly.Internal.Memory.Unicode.Array
374 , Streamly.Internal.Memory.Unicode.Array
375 , Streamly.Internal.Prelude
375 , Streamly.Internal.Prelude
376− , Streamly.Internal.Fusion
377
376
378 -- Mutable data
377 -- Mutable data
379 , Streamly.Internal.Mutable.Prim.Var
378 , Streamly.Internal.Mutable.Prim.Var
@@ -410,9 +409,7 @@ library
410 , monad-control >= 1.0 && < 2
409 , monad-control >= 1.0 && < 2
411 , transformers-base >= 0.4 && < 0.5
410 , transformers-base >= 0.4 && < 0.5
412
411
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
416
413
417 if !impl(ghcjs)
414 if !impl(ghcjs)
418 build-depends:
415 build-depends: