on master help sign in
Remove redundant GHC 8.8 CPP conditional
d84f82dAdithya Kumar
core/src/Streamly/Internal/Data/Array/Stream/Foreign.hs−3
@@ -54,9 +54,6 @@ import Data.Bifunctor (second)
54import Control.Exception (assert)
54import Control.Exception (assert)
55import Control.Monad.Catch (MonadThrow, throwM)
55import Control.Monad.Catch (MonadThrow, throwM)
56import Control.Monad.IO.Class (MonadIO(..))
56import Control.Monad.IO.Class (MonadIO(..))
57−#if __GLASGOW_HASKELL__ < 808
58−import Data.Semigroup (Semigroup(..))
59−#endif
60import Data.Word (Word8)
57import Data.Word (Word8)
61import Streamly.Internal.Data.Unboxed (Unboxed, peekWith, sizeOf)
58import Streamly.Internal.Data.Unboxed (Unboxed, peekWith, sizeOf)
62import Fusion.Plugin.Types (Fuse(..))
59import Fusion.Plugin.Types (Fuse(..))
core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs−3
@@ -219,9 +219,6 @@ import Control.DeepSeq (NFData(..), NFData1(..))
219import Control.Monad (when, void)
219import Control.Monad (when, void)
220import Control.Monad.IO.Class (MonadIO(..))
220import Control.Monad.IO.Class (MonadIO(..))
221import Data.Bits (shiftR, (.|.), (.&.))
221import Data.Bits (shiftR, (.|.), (.&.))
222−#if __GLASGOW_HASKELL__ < 808
223−import Data.Semigroup (Semigroup(..))
224−#endif
225import Data.Word (Word8)
222import Data.Word (Word8)
226import Foreign.C.Types (CSize(..), CInt(..))
223import Foreign.C.Types (CSize(..), CInt(..))
227import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
224import 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
103
103
104import Streamly.Internal.System.IO (unsafeInlineIO, defaultChunkSize)
104import Streamly.Internal.System.IO (unsafeInlineIO, defaultChunkSize)
105
105
106−#if __GLASGOW_HASKELL__ < 808
107−import Data.Semigroup (Semigroup(..))
108−#endif
109−
110--
106--
111-- $setup
107-- $setup
112-- >>> :m
108-- >>> :m
core/src/Streamly/Internal/Data/Fold/Tee.hs−3
@@ -15,9 +15,6 @@ module Streamly.Internal.Data.Fold.Tee
15where
15where
16
16
17import Control.Applicative (liftA2)
17import Control.Applicative (liftA2)
18−#if __GLASGOW_HASKELL__ < 808
19−import Data.Semigroup (Semigroup(..))
20−#endif
21import Streamly.Internal.Data.Fold.Type (Fold)
18import Streamly.Internal.Data.Fold.Type (Fold)
22
19
23import qualified Streamly.Internal.Data.Fold.Type as Fold
20import qualified Streamly.Internal.Data.Fold.Type as Fold
core/src/Streamly/Internal/Data/List.hs−3
@@ -66,9 +66,6 @@ import Control.DeepSeq (NFData(..))
66import Control.DeepSeq (NFData1(..))
66import Control.DeepSeq (NFData1(..))
67import Data.Functor.Identity (Identity, runIdentity)
67import Data.Functor.Identity (Identity, runIdentity)
68import GHC.Exts (IsList(..), IsString(..))
68import GHC.Exts (IsList(..), IsString(..))
69−#if __GLASGOW_HASKELL__ < 808
70−import Data.Semigroup (Semigroup(..))
71−#endif
72import Streamly.Internal.Data.Stream.Type (Stream)
69import Streamly.Internal.Data.Stream.Type (Stream)
73import Streamly.Internal.Data.Stream.Zip (ZipStream(..))
70import Streamly.Internal.Data.Stream.Zip (ZipStream(..))
74
71
core/src/Streamly/Internal/Data/Pipe/Type.hs−3
@@ -22,9 +22,6 @@ where
22import Control.Arrow (Arrow(..))
22import Control.Arrow (Arrow(..))
23import Control.Category (Category(..))
23import Control.Category (Category(..))
24import Data.Maybe (isJust)
24import Data.Maybe (isJust)
25−#if __GLASGOW_HASKELL__ < 808
26−import Data.Semigroup (Semigroup(..))
27−#endif
28import Prelude hiding (zipWith, map, id, unzip, null)
25import Prelude hiding (zipWith, map, id, unzip, null)
29import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))
26import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))
30
27
core/src/Streamly/Internal/Data/Stream/Type.hs−3
@@ -51,9 +51,6 @@ import Data.Foldable (Foldable(foldl'), fold)
51import Data.Functor.Identity (Identity(..), runIdentity)
51import Data.Functor.Identity (Identity(..), runIdentity)
52import Data.Maybe (fromMaybe)
52import Data.Maybe (fromMaybe)
53import Data.Semigroup (Endo(..))
53import Data.Semigroup (Endo(..))
54−#if __GLASGOW_HASKELL__ < 808
55−import Data.Semigroup (Semigroup(..))
56−#endif
57import GHC.Exts (IsList(..), IsString(..), oneShot)
54import GHC.Exts (IsList(..), IsString(..), oneShot)
58import Streamly.Internal.BaseCompat ((#.))
55import Streamly.Internal.BaseCompat ((#.))
59import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
56import 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))
42import Data.Heap (Heap, Entry(..))
42import Data.Heap (Heap, Entry(..))
43import Data.IORef (IORef, readIORef, atomicModifyIORef, writeIORef)
43import Data.IORef (IORef, readIORef, atomicModifyIORef, writeIORef)
44import Data.Maybe (fromJust)
44import Data.Maybe (fromJust)
45−#if __GLASGOW_HASKELL__ < 808
46−import Data.Semigroup (Semigroup(..))
47−#endif
48import GHC.Exts (inline)
45import GHC.Exts (inline)
49
46
50import qualified Data.Heap as H
47import 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))
50import Data.Concurrent.Queue.MichaelScott (LinkedQueue, newQ, nullQ, tryPopR, pushL)
50import Data.Concurrent.Queue.MichaelScott (LinkedQueue, newQ, nullQ, tryPopR, pushL)
51import Data.IORef (IORef, newIORef, readIORef)
51import Data.IORef (IORef, newIORef, readIORef)
52import Data.Maybe (fromJust)
52import Data.Maybe (fromJust)
53−#if __GLASGOW_HASKELL__ < 808
54−import Data.Semigroup (Semigroup(..))
55−#endif
56
53
57import Prelude hiding (map)
54import Prelude hiding (map)
58import qualified Data.Set as S
55import 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))
62import Data.Functor (void)
62import Data.Functor (void)
63import Data.IORef (readIORef, writeIORef)
63import Data.IORef (readIORef, writeIORef)
64import Data.Maybe (fromJust, isNothing)
64import Data.Maybe (fromJust, isNothing)
65−#if __GLASGOW_HASKELL__ < 808
66−import Data.Semigroup (Semigroup(..))
67−#endif
68
65
69import Streamly.Data.Fold (Fold)
66import Streamly.Data.Fold (Fold)
70import Streamly.Internal.Control.Concurrent (MonadAsync)
67import Streamly.Internal.Control.Concurrent (MonadAsync)
src/Streamly/Internal/Data/Stream/Serial.hs−3
@@ -34,9 +34,6 @@ module Streamly.Internal.Data.Stream.Serial
34 )
34 )
35where
35where
36
36
37−#if __GLASGOW_HASKELL__ < 808
38−import Data.Semigroup (Semigroup(..))
39−#endif
40import GHC.Exts (IsList(..))
37import GHC.Exts (IsList(..))
41import Streamly.Data.Stream (Stream)
38import Streamly.Data.Stream (Stream)
42
39
src/Streamly/Internal/Data/Stream/WSerial.hs−3
@@ -38,9 +38,6 @@ import Data.Foldable (Foldable(foldl'), fold)
38import Data.Functor.Identity (Identity(..), runIdentity)
38import Data.Functor.Identity (Identity(..), runIdentity)
39import Data.Maybe (fromMaybe)
39import Data.Maybe (fromMaybe)
40import Data.Semigroup (Endo(..))
40import Data.Semigroup (Endo(..))
41−#if __GLASGOW_HASKELL__ < 808
42−import Data.Semigroup (Semigroup(..))
43−#endif
44import GHC.Exts (IsList(..), IsString(..), oneShot)
41import GHC.Exts (IsList(..), IsString(..), oneShot)
45import Text.Read
42import Text.Read
46 ( Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec
43 ( 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
21 )
21 )
22where
22where
23
23
24−#if __GLASGOW_HASKELL__ < 808
25−import Data.Semigroup (Semigroup(..))
26−#endif
27import Streamly.Internal.Control.Concurrent (MonadAsync)
24import Streamly.Internal.Control.Concurrent (MonadAsync)
28import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
25import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
29
26
test/Streamly/Test/Data/Stream/Async.hs−3
@@ -16,9 +16,6 @@ import Control.Exception (Exception, try)
16import Control.Monad (replicateM)
16import Control.Monad (replicateM)
17import Control.Monad.Catch (throwM)
17import Control.Monad.Catch (throwM)
18import Data.List (sort)
18import Data.List (sort)
19−#if __GLASGOW_HASKELL__ < 808
20−import Data.Semigroup ((<>))
21−#endif
22import Data.Word (Word8)
19import Data.Word (Word8)
23import Streamly.Data.Stream (Stream)
20import Streamly.Data.Stream (Stream)
24import Test.Hspec.QuickCheck
21import Test.Hspec.QuickCheck
test/Streamly/Test/Prelude/Ahead.hs−3
@@ -9,9 +9,6 @@
9
9
10module Streamly.Test.Prelude.Ahead (main) where
10module Streamly.Test.Prelude.Ahead (main) where
11
11
12−#if __GLASGOW_HASKELL__ < 808
13−import Data.Semigroup ((<>))
14−#endif
15import Test.QuickCheck (Property)
12import Test.QuickCheck (Property)
16import Test.Hspec.QuickCheck
13import Test.Hspec.QuickCheck
17import Test.QuickCheck.Monadic (monadicIO, run)
14import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/Async.hs−3
@@ -11,9 +11,6 @@ module Streamly.Test.Prelude.Async (main) where
11
11
12import Control.Concurrent (threadDelay)
12import Control.Concurrent (threadDelay)
13import Data.List (sort)
13import Data.List (sort)
14−#if __GLASGOW_HASKELL__ < 808
15−import Data.Semigroup ((<>))
16−#endif
17import Test.Hspec.QuickCheck
14import Test.Hspec.QuickCheck
18import Test.QuickCheck (Property, withMaxSuccess)
15import Test.QuickCheck (Property, withMaxSuccess)
19import Test.QuickCheck.Monadic (monadicIO, run)
16import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/Serial.hs−3
@@ -17,9 +17,6 @@ import Data.Int (Int64)
17import Data.List (sort, group, intercalate)
17import Data.List (sort, group, intercalate)
18import Data.Maybe ( isJust, fromJust )
18import Data.Maybe ( isJust, fromJust )
19import Data.Word (Word8)
19import Data.Word (Word8)
20−#if __GLASGOW_HASKELL__ < 808
21−import Data.Semigroup ((<>))
22−#endif
23import Data.Semigroup (Sum(..), getSum)
20import Data.Semigroup (Sum(..), getSum)
24import Streamly.Internal.Data.Unboxed (Unboxed)
21import Streamly.Internal.Data.Unboxed (Unboxed)
25import Test.Hspec.QuickCheck
22import Test.Hspec.QuickCheck
test/Streamly/Test/Prelude/WSerial.hs−3
@@ -10,9 +10,6 @@
10module Streamly.Test.Prelude.WSerial (main) where
10module Streamly.Test.Prelude.WSerial (main) where
11
11
12import Data.List (sort)
12import Data.List (sort)
13−#if __GLASGOW_HASKELL__ < 808
14−import Data.Semigroup ((<>))
15−#endif
16import Test.QuickCheck (Property, forAll)
13import Test.QuickCheck (Property, forAll)
17import Test.Hspec.QuickCheck
14import Test.Hspec.QuickCheck
18import Test.QuickCheck.Monadic (monadicIO, run)
15import Test.QuickCheck.Monadic (monadicIO, run)
test/Streamly/Test/Prelude/ZipSerial.hs−3
@@ -9,9 +9,6 @@
9
9
10module Streamly.Test.Prelude.ZipSerial (main) where
10module Streamly.Test.Prelude.ZipSerial (main) where
11
11
12−#if __GLASGOW_HASKELL__ < 808
13−import Data.Semigroup ((<>))
14−#endif
15import Test.Hspec.QuickCheck
12import Test.Hspec.QuickCheck
16import Test.Hspec as H
13import Test.Hspec as H
17
14
test/lib/Streamly/Test/Common.hs−3
@@ -17,9 +17,6 @@ module Streamly.Test.Common
17import Control.Monad (when)
17import Control.Monad (when)
18import Control.Monad.IO.Class (MonadIO(..))
18import Control.Monad.IO.Class (MonadIO(..))
19import Data.List ((\\))
19import Data.List ((\\))
20−#if __GLASGOW_HASKELL__ < 808
21−import Data.Semigroup ((<>))
22−#endif
23import Test.QuickCheck (Property, Gen, choose, counterexample)
20import Test.QuickCheck (Property, Gen, choose, counterexample)
24import Test.QuickCheck.Monadic (PropertyM, assert, monitor, monadicIO)
21import Test.QuickCheck.Monadic (PropertyM, assert, monitor, monadicIO)
25
22