diff --git a/AUTHORS b/AUTHORS --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ === Haskell stm-chans package AUTHORS/THANKS file === -The stm-chans package was written (predominantly) by wren ng thornton +The stm-chans package was written (predominantly) by wren gayle romano and is released under the terms in the LICENSE file. I would also like to give thanks to the following contributers: diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ === stm-chans license === -Copyright (c) 2011--2013, wren ng thornton. +Copyright (c) 2011--2013, wren gayle romano. ALL RIGHTS RESERVED. Redistribution and use in source and binary forms, with or without diff --git a/VERSION b/VERSION --- a/VERSION +++ b/VERSION @@ -1,3 +1,5 @@ +3.0.0.3 (2015-03-29): + - Cleaning up headers to compile cleanly with GHC 7.10 3.0.0 (2013-05-29): - Removed the deprecated compatibility modules. diff --git a/src/Control/Concurrent/STM/TBChan.hs b/src/Control/Concurrent/STM/TBChan.hs --- a/src/Control/Concurrent/STM/TBChan.hs +++ b/src/Control/Concurrent/STM/TBChan.hs @@ -1,14 +1,26 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} {-# LANGUAGE CPP, DeriveDataTypeable #-} +-- HACK: in GHC 7.10, Haddock complains about Control.Monad.STM and +-- System.IO.Unsafe being imported but unused. However, if we use +-- CPP to avoid including them under Haddock, then it will fail to +-- compile! +#ifdef __HADDOCK__ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +#endif + #if __GLASGOW_HASKELL__ >= 701 +# ifdef __HADDOCK__ {-# LANGUAGE Trustworthy #-} +# else +{-# LANGUAGE Safe #-} +# endif #endif ---------------------------------------------------------------- --- 2013.05.29 +-- 2015.03.29 -- | -- Module : Control.Concurrent.STM.TBChan --- Copyright : Copyright (c) 2011--2013 wren ng thornton +-- Copyright : Copyright (c) 2011--2015 wren gayle romano -- License : BSD -- Maintainer : wren@community.haskell.org -- Stability : provisional diff --git a/src/Control/Concurrent/STM/TBMChan.hs b/src/Control/Concurrent/STM/TBMChan.hs --- a/src/Control/Concurrent/STM/TBMChan.hs +++ b/src/Control/Concurrent/STM/TBMChan.hs @@ -1,14 +1,26 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} {-# LANGUAGE CPP, DeriveDataTypeable #-} +-- HACK: in GHC 7.10, Haddock complains about Control.Monad.STM and +-- System.IO.Unsafe being imported but unused. However, if we use +-- CPP to avoid including them under Haddock, then it will fail to +-- compile! +#ifdef __HADDOCK__ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +#endif + #if __GLASGOW_HASKELL__ >= 701 +# ifdef __HADDOCK__ {-# LANGUAGE Trustworthy #-} +# else +{-# LANGUAGE Safe #-} +# endif #endif ---------------------------------------------------------------- --- 2013.05.29 +-- 2015.03.29 -- | -- Module : Control.Concurrent.STM.TBMChan --- Copyright : Copyright (c) 2011--2013 wren ng thornton +-- Copyright : Copyright (c) 2011--2015 wren gayle romano -- License : BSD -- Maintainer : wren@community.haskell.org -- Stability : provisional @@ -51,7 +63,9 @@ import Prelude hiding (reads) import Data.Typeable (Typeable) +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative ((<$>)) +#endif import Control.Monad.STM (STM, retry) import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TChan -- N.B., GHC only diff --git a/src/Control/Concurrent/STM/TBMQueue.hs b/src/Control/Concurrent/STM/TBMQueue.hs --- a/src/Control/Concurrent/STM/TBMQueue.hs +++ b/src/Control/Concurrent/STM/TBMQueue.hs @@ -1,14 +1,26 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} {-# LANGUAGE CPP, DeriveDataTypeable #-} +-- HACK: in GHC 7.10, Haddock complains about Control.Monad.STM and +-- System.IO.Unsafe being imported but unused. However, if we use +-- CPP to avoid including them under Haddock, then it will fail to +-- compile! +#ifdef __HADDOCK__ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +#endif + #if __GLASGOW_HASKELL__ >= 701 +# ifdef __HADDOCK__ {-# LANGUAGE Trustworthy #-} +# else +{-# LANGUAGE Safe #-} +# endif #endif ---------------------------------------------------------------- --- 2013.05.29 +-- 2015.03.29 -- | -- Module : Control.Concurrent.STM.TBMQueue --- Copyright : Copyright (c) 2011--2013 wren ng thornton +-- Copyright : Copyright (c) 2011--2015 wren gayle romano -- License : BSD -- Maintainer : wren@community.haskell.org -- Stability : provisional @@ -49,7 +61,9 @@ import Prelude hiding (reads) import Data.Typeable (Typeable) +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative ((<$>)) +#endif import Control.Monad.STM (STM, retry) import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TQueue -- N.B., GHC only diff --git a/src/Control/Concurrent/STM/TMChan.hs b/src/Control/Concurrent/STM/TMChan.hs --- a/src/Control/Concurrent/STM/TMChan.hs +++ b/src/Control/Concurrent/STM/TMChan.hs @@ -1,14 +1,26 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} {-# LANGUAGE CPP, DeriveDataTypeable #-} +-- HACK: in GHC 7.10, Haddock complains about Control.Monad.STM and +-- System.IO.Unsafe being imported but unused. However, if we use +-- CPP to avoid including them under Haddock, then it will fail to +-- compile! +#ifdef __HADDOCK__ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +#endif + #if __GLASGOW_HASKELL__ >= 701 +# ifdef __HADDOCK__ {-# LANGUAGE Trustworthy #-} +# else +{-# LANGUAGE Safe #-} +# endif #endif ---------------------------------------------------------------- --- 2013.05.29 +-- 2015.03.29 -- | -- Module : Control.Concurrent.STM.TMChan --- Copyright : Copyright (c) 2011--2013 wren ng thornton +-- Copyright : Copyright (c) 2011--2015 wren gayle romano -- License : BSD -- Maintainer : wren@community.haskell.org -- Stability : provisional @@ -45,7 +57,9 @@ ) where import Data.Typeable (Typeable) +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative ((<$>)) +#endif import Control.Monad.STM (STM) import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TChan -- N.B., GHC only diff --git a/src/Control/Concurrent/STM/TMQueue.hs b/src/Control/Concurrent/STM/TMQueue.hs --- a/src/Control/Concurrent/STM/TMQueue.hs +++ b/src/Control/Concurrent/STM/TMQueue.hs @@ -1,14 +1,26 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} {-# LANGUAGE CPP, DeriveDataTypeable #-} +-- HACK: in GHC 7.10, Haddock complains about Control.Monad.STM and +-- System.IO.Unsafe being imported but unused. However, if we use +-- CPP to avoid including them under Haddock, then it will fail to +-- compile! +#ifdef __HADDOCK__ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +#endif + #if __GLASGOW_HASKELL__ >= 701 +# ifdef __HADDOCK__ {-# LANGUAGE Trustworthy #-} +# else +{-# LANGUAGE Safe #-} +# endif #endif ---------------------------------------------------------------- --- 2013.05.29 +-- 2015.03.29 -- | -- Module : Control.Concurrent.STM.TMQueue --- Copyright : Copyright (c) 2011--2013 wren ng thornton +-- Copyright : Copyright (c) 2011--2015 wren gayle romano -- License : BSD -- Maintainer : wren@community.haskell.org -- Stability : provisional @@ -44,7 +56,9 @@ ) where import Data.Typeable (Typeable) +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative ((<$>)) +#endif import Control.Monad.STM (STM) import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TQueue -- N.B., GHC only diff --git a/stm-chans.cabal b/stm-chans.cabal --- a/stm-chans.cabal +++ b/stm-chans.cabal @@ -1,5 +1,5 @@ ---------------------------------------------------------------- --- wren ng thornton ~ 2014.03.30 +-- wren gayle romano ~ 2015.03.29 ---------------------------------------------------------------- -- By and large Cabal >=1.2 is fine; but >= 1.6 gives tested-with: @@ -9,12 +9,12 @@ Build-Type: Custom Name: stm-chans -Version: 3.0.0.2 +Version: 3.0.0.3 Stability: provisional Homepage: http://code.haskell.org/~wren/ -Author: wren ng thornton, Thomas DuBuisson +Author: wren gayle romano, Thomas DuBuisson Maintainer: wren@community.haskell.org -Copyright: Copyright (c) 2011--2013 wren ng thornton +Copyright: Copyright (c) 2011--2013 wren gayle romano License: BSD3 License-File: LICENSE @@ -22,8 +22,9 @@ Synopsis: Additional types of channels for STM. Description: Additional types of channels for STM. +-- Should probably still work with GHC-7.6.1 too Tested-With: - GHC ==7.6.1, GHC ==7.8.0 + GHC ==7.8.3, GHC ==7.10.1 Extra-source-files: AUTHORS, README, VERSION Source-Repository head