[commit: stm] master: Mark all modules as Trustworthy (8a1f81d)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/stm

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8a1f81d7045f6a709a79becc6b64e44e5386478c

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

commit 8a1f81d7045f6a709a79becc6b64e44e5386478c
Author: Bas van Dijk <v.dijk.bas at gmail.com>
Date:   Sun Dec 25 19:05:32 2011 +0100

    Mark all modules as Trustworthy

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

 Control/Concurrent/STM.hs        |    6 ++++++
 Control/Concurrent/STM/TArray.hs |    4 ++++
 Control/Concurrent/STM/TChan.hs  |    6 +++++-
 Control/Concurrent/STM/TMVar.hs  |    6 +++++-
 Control/Concurrent/STM/TVar.hs   |    6 ++++++
 Control/Monad/STM.hs             |    7 ++++++-
 Control/Sequential/STM.hs        |    6 ++++++
 stm.cabal                        |    1 -
 8 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/Control/Concurrent/STM.hs b/Control/Concurrent/STM.hs
index cc44fd0..a17adf4 100644
--- a/Control/Concurrent/STM.hs
+++ b/Control/Concurrent/STM.hs
@@ -1,3 +1,9 @@
+{-# LANGUAGE CPP #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Concurrent.STM
diff --git a/Control/Concurrent/STM/TArray.hs b/Control/Concurrent/STM/TArray.hs
index 534a340..1d26c21 100644
--- a/Control/Concurrent/STM/TArray.hs
+++ b/Control/Concurrent/STM/TArray.hs
@@ -1,5 +1,9 @@
 {-# LANGUAGE CPP, DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses #-}
 
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Concurrent.STM.TArray
diff --git a/Control/Concurrent/STM/TChan.hs b/Control/Concurrent/STM/TChan.hs
index 18aa9f9..dbc2eca 100644
--- a/Control/Concurrent/STM/TChan.hs
+++ b/Control/Concurrent/STM/TChan.hs
@@ -1,5 +1,9 @@
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Control/Concurrent/STM/TMVar.hs b/Control/Concurrent/STM/TMVar.hs
index 698673a..21b50fa 100644
--- a/Control/Concurrent/STM/TMVar.hs
+++ b/Control/Concurrent/STM/TMVar.hs
@@ -1,4 +1,8 @@
-{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Control/Concurrent/STM/TVar.hs b/Control/Concurrent/STM/TVar.hs
index d445493..de9b85a 100644
--- a/Control/Concurrent/STM/TVar.hs
+++ b/Control/Concurrent/STM/TVar.hs
@@ -1,3 +1,9 @@
+{-# LANGUAGE CPP #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Concurrent.STM.TVar
diff --git a/Control/Monad/STM.hs b/Control/Monad/STM.hs
index b0be78b..44bb345 100644
--- a/Control/Monad/STM.hs
+++ b/Control/Monad/STM.hs
@@ -1,5 +1,10 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE MagicHash, UnboxedTuples #-}
+{-# LANGUAGE CPP, MagicHash, UnboxedTuples #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.STM
diff --git a/Control/Sequential/STM.hs b/Control/Sequential/STM.hs
index 096ef5b..328132c 100644
--- a/Control/Sequential/STM.hs
+++ b/Control/Sequential/STM.hs
@@ -2,6 +2,12 @@
 -- Transactions do not run concurrently, but are atomic in the face
 -- of exceptions.
 
+{-# LANGUAGE CPP #-}
+
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -- #hide
 module Control.Sequential.STM (
 	STM, atomically, throwSTM, catchSTM,
diff --git a/stm.cabal b/stm.cabal
index 0891c88..0810085 100644
--- a/stm.cabal
+++ b/stm.cabal
@@ -29,4 +29,3 @@ library
     build-depends: base <4
   if impl(ghc >= 6.10)
     build-depends: base >=4
-  extensions:    CPP