867f51b · distributed-process

git.iko.soy/distributed-process

Base 4.6 compatibility

commit867f51b488f78b107507b0b1e71de7ba33614747 authorEdsko de Vries <edsko@well-typed.com> dateMon 16 Jul 2012, 14:50 (14 years ago) parentbb18101

19 files changed+105−27

compare with master

unifiedsplit

distributed-process-simplelocalnet/ChangeLog+4

@@ -1,3 +1,7 @@

1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2

3+* Relax contraints on bytestring and containers

152012-07-09 Edsko de Vries <edsko@well-typed.com> 0.2.0.1

37* Bugfix: Documentation referred to old module name

distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal+5−5

@@ -1,5 +1,5 @@

11Name: distributed-process-simplelocalnet

2−Version: 0.2.0.1

2+Version: 0.2.0.2

33Cabal-Version: >=1.8

44Build-Type: Simple

55License: BSD3

@@ -25,12 +25,12 @@ Source-Repository head

2525

2626Library

2727 Build-Depends: base >= 4.4 && < 5,

28− bytestring >= 0.9 && < 0.10,

28+ bytestring >= 0.9 && < 0.11,

2929 network >= 2.3 && < 2.4,

3030 network-multicast >= 0.0 && < 0.1,

3131 data-accessor >= 0.2 && < 0.3,

3232 binary >= 0.5 && < 0.6,

33− containers >= 0.4 && < 0.5,

33+ containers >= 0.4 && < 0.6,

3434 transformers >= 0.2 && < 0.4,

3535 network-transport >= 0.2 && < 0.3,

3636 network-transport-tcp >= 0.2 && < 0.3,

@@ -47,12 +47,12 @@ Test-Suite TestSimpleLocalnet

4747 Type: exitcode-stdio-1.0

4848 Main-Is: TestSimpleLocalnet.hs

4949 Build-Depends: base >= 4.4 && < 5,

50− bytestring >= 0.9 && < 0.10,

50+ bytestring >= 0.9 && < 0.11,

5151 network >= 2.3 && < 2.4,

5252 network-multicast >= 0.0 && < 0.1,

5353 data-accessor >= 0.2 && < 0.3,

5454 binary >= 0.5 && < 0.6,

55− containers >= 0.4 && < 0.5,

55+ containers >= 0.4 && < 0.6,

5656 transformers >= 0.2 && < 0.4,

5757 network-transport >= 0.2 && < 0.3,

5858 network-transport-tcp >= 0.2 && < 0.3,

distributed-process/ChangeLog+5

@@ -1,3 +1,8 @@

1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.1.2

3+* Base 4.6 compatibility

4+* Relax constraints on bytestring and containers

162012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.1.1

38* Relax upper bound on 'time' dependency

distributed-process/distributed-process.cabal+13−10

@@ -1,5 +1,5 @@

11Name: distributed-process

2−Version: 0.2.1.1

2+Version: 0.2.1.2

33Cabal-Version: >=1.8

44Build-Type: Simple

55License: BSD3

@@ -37,8 +37,8 @@ Library

3737 transformers >= 0.2 && < 0.4,

3838 mtl >= 2.0 && < 2.2,

3939 data-accessor >= 0.2 && < 0.3,

40− bytestring >= 0.9 && < 0.10,

41− containers >= 0.4 && < 0.5,

40+ bytestring >= 0.9 && < 0.11,

41+ containers >= 0.4 && < 0.6,

4242 old-locale >= 1.0 && < 1.1,

4343 time >= 1.2 && < 1.5,

4444 template-haskell >= 2.6 && < 2.8,

@@ -68,7 +68,8 @@ Library

6868 GADTs,

6969 GeneralizedNewtypeDeriving,

7070 DeriveDataTypeable,

71− TemplateHaskell

71+ TemplateHaskell,

72+ CPP

7273 ghc-options: -Wall

7374 HS-Source-Dirs: src

7475

@@ -83,8 +84,8 @@ Test-Suite TestCH

8384 transformers >= 0.2 && < 0.4,

8485 mtl >= 2.0 && < 2.2,

8586 data-accessor >= 0.2 && < 0.3,

86− bytestring >= 0.9 && < 0.10,

87− containers >= 0.4 && < 0.5,

87+ bytestring >= 0.9 && < 0.11,

88+ containers >= 0.4 && < 0.6,

8889 old-locale >= 1.0 && < 1.1,

8990 time >= 1.2 && < 1.5,

9091 template-haskell >= 2.6 && < 2.8,

@@ -99,7 +100,8 @@ Test-Suite TestCH

99100 GADTs,

100101 GeneralizedNewtypeDeriving,

101102 DeriveDataTypeable,

102− TemplateHaskell

103+ TemplateHaskell,

104+ CPP

103105 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind

104106 HS-Source-Dirs: tests src

105107

@@ -114,8 +116,8 @@ Test-Suite TestClosure

114116 transformers >= 0.2 && < 0.4,

115117 mtl >= 2.0 && < 2.2,

116118 data-accessor >= 0.2 && < 0.3,

117− bytestring >= 0.9 && < 0.10,

118− containers >= 0.4 && < 0.5,

119+ bytestring >= 0.9 && < 0.11,

120+ containers >= 0.4 && < 0.6,

119121 old-locale >= 1.0 && < 1.1,

120122 time >= 1.2 && < 1.5,

121123 template-haskell >= 2.6 && < 2.8,

@@ -130,6 +132,7 @@ Test-Suite TestClosure

130132 GADTs,

131133 GeneralizedNewtypeDeriving,

132134 DeriveDataTypeable,

133− TemplateHaskell

135+ TemplateHaskell,

136+ CPP

134137 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind

135138 HS-Source-Dirs: tests src

distributed-process/src/Control/Distributed/Process.hs+4

@@ -91,7 +91,11 @@ module Control.Distributed.Process

9191 , DidSpawn(..)

9292 ) where

9393

94+

95+#if ! MIN_VERSION_base(4,6,0)

9496import Prelude hiding (catch)

97+#endif

98+

9599import Data.Typeable (Typeable)

96100import Control.Monad.IO.Class (liftIO)

97101import Control.Distributed.Process.Internal.Types

distributed-process/src/Control/Distributed/Process/Internal/Primitives.hs+3

@@ -55,7 +55,10 @@ module Control.Distributed.Process.Internal.Primitives

5555 , monitorPort

5656 ) where

5757

58+#if ! MIN_VERSION_base(4,6,0)

5859import Prelude hiding (catch)

60+#endif

61+

5962import Data.Binary (decode)

6063import Data.Typeable (Typeable, typeOf)

6164import Data.Time.Clock (getCurrentTime)

distributed-process/src/Control/Distributed/Process/Node.hs+4

@@ -9,7 +9,11 @@ module Control.Distributed.Process.Node

99 , localNodeId

1010 ) where

1111

12+

13+#if ! MIN_VERSION_base(4,6,0)

1214import Prelude hiding (catch)

15+#endif

16+

1317import System.IO (fixIO, hPutStrLn, stderr)

1418import qualified Data.ByteString.Lazy as BSL (fromChunks)

1519import Data.Binary (decode)

distributed-process/tests/TestAuxiliary.hs+4

@@ -8,7 +8,11 @@ module TestAuxiliary ( -- Running tests

88 , randomThreadDelay

99 ) where

1010

11+

12+#if ! MIN_VERSION_base(4,6,0)

1113import Prelude hiding (catch)

14+#endif

15+

1216import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)

1317import Control.Monad (liftM2, unless)

1418import Control.Exception (SomeException, try, catch)

distributed-process/tests/TestCH.hs+3

@@ -1,6 +1,9 @@

11module Main where

3+#if ! MIN_VERSION_base(4,6,0)

34import Prelude hiding (catch)

5+#endif

47import Data.Binary (Binary(..))

58import Data.Typeable (Typeable)

69import Data.Foldable (forM_)

network-transport-tcp/ChangeLog+5

@@ -1,3 +1,8 @@

1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2

3+* Base 4.6 compatibility

4+* Relax package contraints on bytestring and containers

162012-07-12 Edsko de Vries <edsko@well-typed.com> 0.2.0.1

38* Fix bug in recvExact

network-transport-tcp/network-transport-tcp.cabal+8−6

@@ -1,5 +1,5 @@

11Name: network-transport-tcp

2−Version: 0.2.0.1

2+Version: 0.2.0.2

33Cabal-Version: >=1.8

44Build-Type: Simple

55License: BSD3

@@ -24,11 +24,12 @@ Library

2424 Build-Depends: base >= 4.3 && < 5,

2525 network-transport >= 0.2 && < 0.3,

2626 data-accessor >= 0.2 && < 0.3,

27− containers >= 0.4 && < 0.5,

28− bytestring >= 0.9 && < 0.10,

27+ containers >= 0.4 && < 0.6,

28+ bytestring >= 0.9 && < 0.11,

2929 network >= 2.3 && < 2.4

3030 Exposed-modules: Network.Transport.TCP,

3131 Network.Transport.TCP.Internal

32+ Extensions: CPP

3233 ghc-options: -Wall -fno-warn-unused-do-bind

3334 HS-Source-Dirs: src

3435

@@ -38,8 +39,8 @@ Test-Suite TestTCP

3839 Build-Depends: base >= 4.3 && < 5,

3940 network-transport >= 0.2 && < 0.3,

4041 data-accessor >= 0.2 && < 0.3,

41− containers >= 0.4 && < 0.5,

42− bytestring >= 0.9 && < 0.10,

42+ containers >= 0.4 && < 0.6,

43+ bytestring >= 0.9 && < 0.11,

4344 network >= 2.3 && < 2.4,

4445 random >= 1.0 && < 1.1,

4546 ansi-terminal >= 0.5 && < 0.6,

@@ -50,5 +51,6 @@ Test-Suite TestTCP

5051 DeriveDataTypeable,

5152 RankNTypes,

5253 OverlappingInstances,

53− OverloadedStrings

54+ OverloadedStrings,

55+ CPP

5456 HS-Source-Dirs: tests src

network-transport-tcp/src/Network/Transport/TCP.hs+7−1

@@ -28,7 +28,13 @@ module Network.Transport.TCP ( -- * Main API

2828 -- $design

2929 ) where

3030

31−import Prelude hiding (catch, mapM_)

31+import Prelude hiding

32+ ( mapM_

33+#if ! MIN_VERSION_base(4,6,0)

34+ , catch

35+#endif

36+ )

37+

3238import Network.Transport

3339import Network.Transport.TCP.Internal ( forkServer

3440 , recvWithLength

network-transport-tcp/src/Network/Transport/TCP/Internal.hs+3

@@ -6,7 +6,10 @@ module Network.Transport.TCP.Internal ( forkServer

66 , tryCloseSocket

77 ) where

9+#if ! MIN_VERSION_base(4,6,0)

910import Prelude hiding (catch)

11+#endif

12+

1013import Network.Transport.Internal (decodeInt32, void, tryIO, forkIOWithUnmask)

1114import qualified Network.Socket as N ( HostName

1215 , ServiceName

network-transport-tcp/tests/TestAuxiliary.hs+3

@@ -8,7 +8,10 @@ module TestAuxiliary ( -- Running tests

88 , randomThreadDelay

99 ) where

1010

11+#if ! MIN_VERSION_base(4,6,0)

1112import Prelude hiding (catch)

13+#endif

14+

1215import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)

1316import Control.Concurrent.Chan (Chan)

1417import Control.Monad (liftM2, unless)

network-transport-tcp/tests/TestTCP.hs+9−1

@@ -2,7 +2,15 @@

22{-# OPTIONS_GHC -fno-warn-orphans #-}

33module Main where

5−import Prelude hiding (catch, (>>=), (>>), return, fail)

5+import Prelude hiding

6+ ( (>>=)

7+ , return

8+ , fail

9+ , (>>)

10+#if ! MIN_VERSION_base(4,6,0)

11+ , catch

12+#endif

13+ )

614import TestTransport (testTransport)

715import TestAuxiliary (forkTry, runTests)

816import Network.Transport

network-transport-tcp/tests/TestTransport.hs+9−1

@@ -1,7 +1,15 @@

11{-# LANGUAGE RebindableSyntax #-}

22module TestTransport where

4−import Prelude hiding (catch, (>>=), (>>), return, fail)

4+import Prelude hiding

5+ ( (>>=)

6+ , return

7+ , fail

8+ , (>>)

9+#if ! MIN_VERSION_base(4,6,0)

10+ , catch

11+#endif

12+ )

513import TestAuxiliary (forkTry, runTests, trySome, randomThreadDelay)

614import Control.Concurrent (forkIO, killThread, yield)

715import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar, readMVar, tryTakeMVar, modifyMVar_, newMVar)

network-transport-tcp/tests/Traced.hs+9−1

@@ -50,7 +50,15 @@ module Traced ( MonadS(..)

5050 , traceShow

5151 ) where

5252

53−import Prelude hiding ((>>=), return, fail, catch, (>>))

53+import Prelude hiding

54+ ( (>>=)

55+ , return

56+ , fail

57+ , (>>)

58+#if ! MIN_VERSION_base(4,6,0)

59+ , catch

60+#endif

61+ )

5462import qualified Prelude

5563import Control.Exception (catches, Handler(..), SomeException, throwIO, Exception(..), IOException)

5664import Control.Applicative ((<$>))

network-transport/ChangeLog+5

@@ -1,3 +1,8 @@

1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2

3+* Base 4.6 compatible test suites

4+* Relax package constraints for bytestring

162012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.1

38* Hide catch only for base < 4.6

network-transport/network-transport.cabal+2−2

@@ -1,5 +1,5 @@

11Name: network-transport

2−Version: 0.2.0.1

2+Version: 0.2.0.2

33Cabal-Version: >=1.6

44Build-Type: Simple

55License: BSD3

@@ -66,7 +66,7 @@ Source-Repository head

6666Library

6767 Build-Depends: base >= 4.3 && < 5,

6868 binary >= 0.5 && < 0.6,

69− bytestring >= 0.9 && < 0.10,

69+ bytestring >= 0.9 && < 0.11,

7070 transformers >= 0.2 && < 0.4

7171 Exposed-Modules: Network.Transport,

7272 Network.Transport.Util