Merge pull request #77 from mboes/ghc710-warnings

Fix AMP and Safe Haskell related warnings in GHC 7.10.
kolmodin · Jun 8, 2015 · 6892225 · 6892225
2 parents 8debedd + 5714385
commit 6892225
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
@@ -87,6 +87,7 @@ import GHC.Word (Word32(..),Word16(..),Word64(..))
 import GHC.Word (uncheckedShiftRL64#)
 # endif
 #endif
+import Prelude -- Silence AMP warning.
 
 ------------------------------------------------------------------------
 

diff --git a/src/Data/Binary/Builder/Internal.hs b/src/Data/Binary/Builder/Internal.hs
@@ -1,13 +1,13 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Data.Binary.Builder.Internal
 -- Copyright   : Lennart Kolmodin, Ross Paterson
 -- License     : BSD3-style (see LICENSE)
--- 
+--
 -- Maintainer  : Lennart Kolmodin <kolmodin@gmail.com>
 -- Stability   : experimental
 -- Portability : portable to Hugs and GHC

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP, FlexibleContexts #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 #ifdef GENERICS
 {-# LANGUAGE DefaultSignatures #-}
@@ -41,12 +41,13 @@ module Data.Binary.Class (
     ) where
 
 import Data.Word
+import Data.Bits
+import Data.Int
 
 import Data.Binary.Put
 import Data.Binary.Get
 
 import Control.Monad
-import Foreign
 
 import Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L

diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE BangPatterns, CPP, FlexibleInstances, KindSignatures,
-    ScopedTypeVariables, Trustworthy, TypeOperators, TypeSynonymInstances #-}
+    ScopedTypeVariables, Safe, TypeOperators, TypeSynonymInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -----------------------------------------------------------------------------
@@ -26,6 +26,7 @@ import Data.Binary.Put
 import Data.Bits
 import Data.Word
 import GHC.Generics
+import Prelude -- Silence AMP warning.
 
 -- Type without constructors
 instance GBinary V1 where

diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
@@ -203,8 +203,6 @@ import qualified Data.ByteString.Unsafe as B
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Lazy.Internal as L
 
-import Control.Applicative
-
 import Data.Binary.Get.Internal hiding ( Decoder(..), runGetIncremental )
 import qualified Data.Binary.Get.Internal as I
 

diff --git a/src/Data/Binary/Put.hs b/src/Data/Binary/Put.hs
@@ -1,14 +1,14 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Data.Binary.Put
 -- Copyright   : Lennart Kolmodin
 -- License     : BSD3-style (see LICENSE)
--- 
+--
 -- Maintainer  : Lennart Kolmodin <kolmodin@gmail.com>
 -- Stability   : stable
 -- Portability : Portable to Hugs and GHC. Requires MPTCs
@@ -62,11 +62,12 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
 
 import Control.Applicative
+import Prelude -- Silence AMP warning.
 
 
 ------------------------------------------------------------------------
 
--- XXX Strict in buffer only. 
+-- XXX Strict in buffer only.
 data PairS a = PairS a !Builder
 
 sndS :: PairS a -> Builder