on master help sign in
Remove redundant GHC 8.8 CPP conditional
commitd84f82d973df0d418ac8f70a6342dfe54ddff075 authorAdithya Kumar <adithya@composewell.com> dateWed 28 Sep 2022, 16:11 (4 years ago) parent3a90efb
20 files changed−61
core/src/Streamly/Internal/Data/Array/Stream/Foreign.hs−3 core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs−3 core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs−4 core/src/Streamly/Internal/Data/Fold/Tee.hs−3 core/src/Streamly/Internal/Data/List.hs−3 core/src/Streamly/Internal/Data/Pipe/Type.hs−3 core/src/Streamly/Internal/Data/Stream/Type.hs−3 src/Streamly/Internal/Data/Stream/Ahead.hs−3 src/Streamly/Internal/Data/Stream/IsStream/Async.hs−3 src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs−3 src/Streamly/Internal/Data/Stream/Serial.hs−3 src/Streamly/Internal/Data/Stream/WSerial.hs−3 src/Streamly/Internal/Data/Stream/ZipAsync.hs−3 test/Streamly/Test/Data/Stream/Async.hs−3 test/Streamly/Test/Prelude/Ahead.hs−3 test/Streamly/Test/Prelude/Async.hs−3 test/Streamly/Test/Prelude/Serial.hs−3 test/Streamly/Test/Prelude/WSerial.hs−3 test/Streamly/Test/Prelude/ZipSerial.hs−3 test/lib/Streamly/Test/Common.hs−3
core/src/Streamly/Internal/Data/Array/Stream/Foreign.hs−3
@@ -54,9 +54,6 @@ import Data.Bifunctor (second)
5454import Control.Exception (assert)
5555import Control.Monad.Catch (MonadThrow, throwM)
5656import Control.Monad.IO.Class (MonadIO(..))
57−#if __GLASGOW_HASKELL__ < 808
58−import Data.Semigroup (Semigroup(..))
59−#endif
6057import Data.Word (Word8)
6158import Streamly.Internal.Data.Unboxed (Unboxed, peekWith, sizeOf)
6259import Fusion.Plugin.Types (Fuse(..))
core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs−3
@@ -219,9 +219,6 @@ import Control.DeepSeq (NFData(..), NFData1(..))
219219import Control.Monad (when, void)
220220import Control.Monad.IO.Class (MonadIO(..))
221221import Data.Bits (shiftR, (.|.), (.&.))
222−#if __GLASGOW_HASKELL__ < 808
223−import Data.Semigroup (Semigroup(..))
224−#endif
225222import Data.Word (Word8)
226223import Foreign.C.Types (CSize(..), CInt(..))
227224import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs−4
@@ -103,10 +103,6 @@ import qualified GHC.Exts as Exts
103103
104104import Streamly.Internal.System.IO (unsafeInlineIO, defaultChunkSize)
105105
106−#if __GLASGOW_HASKELL__ < 808
107−import Data.Semigroup (Semigroup(..))
108−#endif
109−
110106--
111107-- $setup
112108-- >>> :m
core/src/Streamly/Internal/Data/Fold/Tee.hs−3
@@ -15,9 +15,6 @@ module Streamly.Internal.Data.Fold.Tee
1515where
1616
1717import Control.Applicative (liftA2)
18−#if __GLASGOW_HASKELL__ < 808
19−import Data.Semigroup (Semigroup(..))
20−#endif
2118import Streamly.Internal.Data.Fold.Type (Fold)
2219
2320import qualified Streamly.Internal.Data.Fold.Type as Fold
core/src/Streamly/Internal/Data/List.hs−3
@@ -66,9 +66,6 @@ import Control.DeepSeq (NFData(..))
6666import Control.DeepSeq (NFData1(..))
6767import Data.Functor.Identity (Identity, runIdentity)
6868import GHC.Exts (IsList(..), IsString(..))
69−#if __GLASGOW_HASKELL__ < 808
70−import Data.Semigroup (Semigroup(..))
71−#endif
7269import Streamly.Internal.Data.Stream.Type (Stream)
7370import Streamly.Internal.Data.Stream.Zip (ZipStream(..))
7471
core/src/Streamly/Internal/Data/Pipe/Type.hs−3
@@ -22,9 +22,6 @@ where
2222import Control.Arrow (Arrow(..))
2323import Control.Category (Category(..))
2424import Data.Maybe (isJust)
25−#if __GLASGOW_HASKELL__ < 808
26−import Data.Semigroup (Semigroup(..))
27−#endif
2825import Prelude hiding (zipWith, map, id, unzip, null)
2926import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))
3027
core/src/Streamly/Internal/Data/Stream/Type.hs−3
@@ -51,9 +51,6 @@ import Data.Foldable (Foldable(foldl'), fold)
5151import Data.Functor.Identity (Identity(..), runIdentity)
5252import Data.Maybe (fromMaybe)
5353import Data.Semigroup (Endo(..))
54−#if __GLASGOW_HASKELL__ < 808
55−import Data.Semigroup (Semigroup(..))
56−#endif
5754import GHC.Exts (IsList(..), IsString(..), oneShot)
5855import Streamly.Internal.BaseCompat ((#.))
5956import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
src/Streamly/Internal/Data/Stream/Ahead.hs−3
@@ -42,9 +42,6 @@ import Control.Monad.Trans.Class (MonadTrans(lift))
4242import Data.Heap (Heap, Entry(..))
4343import Data.IORef (IORef, readIORef, atomicModifyIORef, writeIORef)
4444import Data.Maybe (fromJust)
45−#if __GLASGOW_HASKELL__ < 808
46−import Data.Semigroup (Semigroup(..))
47−#endif
4845import GHC.Exts (inline)
4946
5047import qualified Data.Heap as H
src/Streamly/Internal/Data/Stream/IsStream/Async.hs−3
@@ -50,9 +50,6 @@ import Control.Monad.Trans.Class (MonadTrans(lift))
5050import Data.Concurrent.Queue.MichaelScott (LinkedQueue, newQ, nullQ, tryPopR, pushL)
5151import Data.IORef (IORef, newIORef, readIORef)
5252import Data.Maybe (fromJust)
53−#if __GLASGOW_HASKELL__ < 808
54−import Data.Semigroup (Semigroup(..))
55−#endif
5653
5754import Prelude hiding (map)
5855import qualified Data.Set as S
src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs−3
@@ -62,9 +62,6 @@ import Control.Monad.Trans.Class (MonadTrans(lift))
6262import Data.Functor (void)
6363import Data.IORef (readIORef, writeIORef)
6464import Data.Maybe (fromJust, isNothing)
65−#if __GLASGOW_HASKELL__ < 808
66−import Data.Semigroup (Semigroup(..))
67−#endif
6865
6966import Streamly.Data.Fold (Fold)
7067import Streamly.Internal.Control.Concurrent (MonadAsync)
src/Streamly/Internal/Data/Stream/Serial.hs−3
@@ -34,9 +34,6 @@ module Streamly.Internal.Data.Stream.Serial
3434 )
3535where
3636
37−#if __GLASGOW_HASKELL__ < 808
38−import Data.Semigroup (Semigroup(..))
39−#endif
4037import GHC.Exts (IsList(..))
4138import Streamly.Data.Stream (Stream)
4239
src/Streamly/Internal/Data/Stream/WSerial.hs−3
@@ -38,9 +38,6 @@ import Data.Foldable (Foldable(foldl'), fold)
3838import Data.Functor.Identity (Identity(..), runIdentity)
3939import Data.Maybe (fromMaybe)
4040import Data.Semigroup (Endo(..))
41−#if __GLASGOW_HASKELL__ < 808
42−import Data.Semigroup (Semigroup(..))
43−#endif
4441import GHC.Exts (IsList(..), IsString(..), oneShot)
4542import Text.Read
4643 ( Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec
src/Streamly/Internal/Data/Stream/ZipAsync.hs−3
@@ -21,9 +21,6 @@ module Streamly.Internal.Data.Stream.ZipAsync
2121 )
2222where
2323
24−#if __GLASGOW_HASKELL__ < 808
25−import Data.Semigroup (Semigroup(..))
26−#endif
2724import Streamly.Internal.Control.Concurrent (MonadAsync)
2825import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
2926
test/Streamly/Test/Data/Stream/Async.hs−3
@@ -16,9 +16,6 @@ import Control.Exception (Exception, try)
1616import Control.Monad (replicateM)
1717import Control.Monad.Catch (throwM)
1818import Data.List (sort)
19−#if __GLASGOW_HASKELL__ < 808
20−import Data.Semigroup ((<>))
21−#endif
2219import Data.Word (Word8)
2320import Streamly.Data.Stream (Stream)
2421import Test.Hspec.QuickCheck
test/Streamly/Test/Prelude/Ahead.hs−3
@@ -9,9 +9,6 @@
99
1010module Streamly.Test.Prelude.Ahead (main) where
1111
12−#if __GLASGOW_HASKELL__ < 808
13−import Data.Semigroup ((<>))
14−#endif
1512import Test.QuickCheck (Property)
1613import Test.Hspec.QuickCheck
1714import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/Async.hs−3
@@ -11,9 +11,6 @@ module Streamly.Test.Prelude.Async (main) where
1111
1212import Control.Concurrent (threadDelay)
1313import Data.List (sort)
14−#if __GLASGOW_HASKELL__ < 808
15−import Data.Semigroup ((<>))
16−#endif
1714import Test.Hspec.QuickCheck
1815import Test.QuickCheck (Property, withMaxSuccess)
1916import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/Serial.hs−3
@@ -17,9 +17,6 @@ import Data.Int (Int64)
1717import Data.List (sort, group, intercalate)
1818import Data.Maybe ( isJust, fromJust )
1919import Data.Word (Word8)
20−#if __GLASGOW_HASKELL__ < 808
21−import Data.Semigroup ((<>))
22−#endif
2320import Data.Semigroup (Sum(..), getSum)
2421import Streamly.Internal.Data.Unboxed (Unboxed)
2522import Test.Hspec.QuickCheck
test/Streamly/Test/Prelude/WSerial.hs−3
@@ -10,9 +10,6 @@
1010module Streamly.Test.Prelude.WSerial (main) where
1111
1212import Data.List (sort)
13−#if __GLASGOW_HASKELL__ < 808
14−import Data.Semigroup ((<>))
15−#endif
1613import Test.QuickCheck (Property, forAll)
1714import Test.Hspec.QuickCheck
1815import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/ZipSerial.hs−3
@@ -9,9 +9,6 @@
99
1010module Streamly.Test.Prelude.ZipSerial (main) where
1111
12−#if __GLASGOW_HASKELL__ < 808
13−import Data.Semigroup ((<>))
14−#endif
1512import Test.Hspec.QuickCheck
1613import Test.Hspec as H
1714
test/lib/Streamly/Test/Common.hs−3
@@ -17,9 +17,6 @@ module Streamly.Test.Common
1717import Control.Monad (when)
1818import Control.Monad.IO.Class (MonadIO(..))
1919import Data.List ((\\))
20−#if __GLASGOW_HASKELL__ < 808
21−import Data.Semigroup ((<>))
22−#endif
2320import Test.QuickCheck (Property, Gen, choose, counterexample)
2421import Test.QuickCheck.Monadic (PropertyM, assert, monitor, monadicIO)
2522