[commit: packages/binary] master: Fix AMP and Safe Haskell related warnings in GHC 7.10. (7524d87)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/7524d87040395793375c8752ef2ae4314d8d69f5

>---------------------------------------------------------------

commit 7524d87040395793375c8752ef2ae4314d8d69f5
Author: Mathieu Boespflug <m at tweag.io>
Date:   Sat Jun 6 23:30:05 2015 +0200

    Fix AMP and Safe Haskell related warnings in GHC 7.10.


>---------------------------------------------------------------

7524d87040395793375c8752ef2ae4314d8d69f5
 src/Data/Binary/Builder/Base.hs     | 1 +
 src/Data/Binary/Builder/Internal.hs | 2 +-
 src/Data/Binary/Generic.hs          | 1 +
 src/Data/Binary/Get.hs              | 2 --
 src/Data/Binary/Put.hs              | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
index 897aa2b..c4f0790 100644
--- 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
index c9d2fbf..2a28539 100644
--- a/src/Data/Binary/Builder/Internal.hs
+++ b/src/Data/Binary/Builder/Internal.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index a2eb6ea..e1a3a1c 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -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
index afff081..0541efb 100644
--- 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
index 38a1b31..004c15a 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/Data/Binary/Put.hs
@@ -62,6 +62,7 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
 
 import Control.Applicative
+import Prelude -- Silence AMP warning.
 
 
 ------------------------------------------------------------------------