[commit: packages/containers] develop-0.6, develop-0.6-questionable, master, zip-devel: Tighten Safe Haskell bounds, fixes new warning in GHC 7.10. (245ef13)

git at git.haskell.org git at git.haskell.org
Fri Jan 23 22:39:38 UTC 2015


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

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/245ef135eb8701fcd139770e564f25e774d26422

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

commit 245ef135eb8701fcd139770e564f25e774d26422
Author: David Terei <code at davidterei.com>
Date:   Wed Nov 12 18:19:51 2014 -0800

    Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.


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

245ef135eb8701fcd139770e564f25e774d26422
 Data/IntMap.hs           | 2 +-
 Data/IntMap/Lazy.hs      | 2 +-
 Data/IntMap/Strict.hs    | 4 +++-
 Data/Utils/StrictFold.hs | 2 +-
 Data/Utils/StrictPair.hs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Data/IntMap.hs b/Data/IntMap.hs
index 29ca3f5..52b05c2 100644
--- a/Data/IntMap.hs
+++ b/Data/IntMap.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Lazy.hs b/Data/IntMap/Lazy.hs
index ab89e1a..62bf835 100644
--- a/Data/IntMap/Lazy.hs
+++ b/Data/IntMap/Lazy.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 3a7dde8..f1c363c 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
-#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
 -----------------------------------------------------------------------------
diff --git a/Data/Utils/StrictFold.hs b/Data/Utils/StrictFold.hs
index 953c9f1..b080e8a 100644
--- a/Data/Utils/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictFold (foldlStrict) where
 
diff --git a/Data/Utils/StrictPair.hs b/Data/Utils/StrictPair.hs
index 6ae7ded..0c01ca4 100644
--- a/Data/Utils/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictPair (StrictPair(..), toPair) where
 



More information about the ghc-commits mailing list