Fix build warnings

Author: Bodigrim

benchmarks/haskell/Benchmarks/Builder.hs

@@ -4,15 +4,17 @@
 --
 -- * Concatenating many small strings using a builder
 --
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
 module Benchmarks.Builder
     ( benchmark
     ) where
 
 import Test.Tasty.Bench (Benchmark, bgroup, bench, nf)
 import Data.Binary.Builder as B
 import Data.ByteString.Char8 ()
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (mconcat, mempty)
+#endif
 import qualified Data.ByteString.Builder as Blaze
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.Lazy as LB

benchmarks/haskell/Benchmarks/DecodeUtf8.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE ForeignFunctionInterface #-}
+{-# OPTIONS_GHC -fno-warn-deprecations #-}
 
 -- | Test decoding of UTF-8
 --

benchmarks/haskell/Benchmarks/FileRead.hs

@@ -4,11 +4,16 @@
 --
 -- * Reading a file from the disk
 --
+
+{-# LANGUAGE CPP #-}
+
 module Benchmarks.FileRead
     ( benchmark
     ) where
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative ((<$>))
+#endif
 import Test.Tasty.Bench (Benchmark, bgroup, bench, whnfIO)
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.Lazy as LB

benchmarks/haskell/Benchmarks/Programs/BigTable.hs

@@ -6,13 +6,15 @@
 --
 -- * Writing to a handle
 --
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
 module Benchmarks.Programs.BigTable
     ( benchmark
     ) where
 
 import Test.Tasty.Bench (Benchmark, bench, whnfIO)
-import Data.Monoid (mappend, mconcat)
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid (mconcat, mempty)
+#endif
 import Data.Text.Lazy.Builder (Builder, fromText, toLazyText)
 import Data.Text.Lazy.IO (hPutStr)
 import System.IO (Handle)

benchmarks/haskell/Benchmarks/Programs/Fold.hs

@@ -12,14 +12,16 @@
 --
 -- * Writing back to a handle
 --
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
 module Benchmarks.Programs.Fold
     ( benchmark
     ) where
 
 import Data.List (foldl')
 import Data.List (intersperse)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (mempty, mappend, mconcat)
+#endif
 import System.IO (Handle)
 import Test.Tasty.Bench (Benchmark, bench, whnfIO)
 import qualified Data.Text as T

benchmarks/haskell/Benchmarks/Programs/Sort.hs

@@ -12,13 +12,15 @@
 --
 -- * Writing back to a handle
 --
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
 module Benchmarks.Programs.Sort
     ( benchmark
     ) where
 
 import Test.Tasty.Bench (Benchmark, bgroup, bench, whnfIO)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (mconcat)
+#endif
 import System.IO (Handle)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as BL

benchmarks/haskell/Benchmarks/Pure.hs

@@ -15,7 +15,9 @@ module Benchmarks.Pure
 import Control.DeepSeq (NFData (..))
 import Control.Exception (evaluate)
 import Test.Tasty.Bench (Benchmark, bgroup, bench, nf)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (mappend, mempty)
+#endif
 import GHC.Base (Char (..), Int (..), chr#, ord#, (+#))
 import GHC.Generics (Generic)
 import GHC.Int (Int64)

src/Data/Text/Internal/Lazy/Encoding/Fusion.hs

@@ -54,7 +54,6 @@ import Data.ByteString.Internal (mallocByteString, memcpy)
 #if defined(ASSERTS)
 import Control.Exception (assert)
 #endif
-import Data.Text.Internal.ByteStringCompat
 
 data S = S0
        | S1 {-# UNPACK #-} !Word8

tests/Tests/Properties/Builder.hs

@@ -7,9 +7,11 @@ module Tests.Properties.Builder
     ( testBuilder
     ) where
 
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
+#endif
 import Data.Int (Int8, Int16, Int32, Int64)
-import Data.Word (Word, Word8, Word16, Word32, Word64)
+import Data.Word
 import Numeric (showEFloat, showFFloat, showGFloat, showHex)
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)

tests/Tests/Properties/Instances.hs

@@ -1,11 +1,14 @@
 -- | Test instances
 
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-enable-rewrite-rules -fno-warn-missing-signatures #-}
 module Tests.Properties.Instances
     ( testInstances
     ) where
 
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
+#endif
 import Data.String (IsString(fromString))
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)